diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 34d2c453..bfb4688d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,6 +6,7 @@ labels: ''
 assignees: ''
 
 ---
+<!-- Please have a look at our [Contributing Guidelines](https://github.com/janeczku/calibre-web/blob/master/CONTRIBUTING.md) -->
 
 **Describe the bug/problem**
 A clear and concise description of what the bug is. If you are asking for support, please check our [Wiki](https://github.com/janeczku/calibre-web/wiki) if your question is already answered there.
@@ -30,7 +31,7 @@ If applicable, add screenshots to help explain your problem.
  - OS: [e.g. Windows 10/Raspberry Pi OS]
  - Python version: [e.g. python2.7]
  - Calibre-Web version: [e.g. 0.6.8 or 087c4c59 (git rev-parse --short HEAD)]:
- - Docker container: [None/Technosoft2000/Linuxuser]:
+ - Docker container: [None/Technosoft2000/LinuxServer]:
  - Special Hardware: [e.g. Rasperry Pi Zero]
  - Browser: [e.g. Chrome 83.0.4103.97, Safari 13.3.7, Firefox 68.0.1 ESR]
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 1a71b1ac..6b2b9afc 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+<!-- Please have a look at our [Contributing Guidelines](https://github.com/janeczku/calibre-web/blob/master/CONTRIBUTING.md) -->
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
diff --git a/.gitignore b/.gitignore
index f06dcd44..109de4ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ env/
 venv/
 eggs/
 dist/
+executable/
 build/
 vendor/
 .eggs/
diff --git a/README.md b/README.md
index 82c7976c..3f0792bf 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 - full graphical setup
 - User management with fine-grained per-user permissions
 - Admin interface
-- User Interface in czech, dutch, english, finnish, french, german, hungarian, italian, japanese, khmer, polish, russian, simplified chinese, spanish, swedish, turkish, ukrainian
+- User Interface in czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, polish, russian, simplified chinese, spanish, swedish, turkish, ukrainian
 - OPDS feed for eBook reader apps 
 - Filter and search by titles, authors, tags, series and language
 - Create a custom book collection (shelves)
@@ -32,8 +32,8 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 
 ## Quick start
 
-1. Install dependencies by running `pip3 install --target vendor -r requirements.txt` (python3.x) or `pip install --target vendor -r requirements.txt` (python2.7).
-2. Execute the command: `python cps.py` (or `nohup python cps.py` - recommended if you want to exit the terminal window)
+1. Install dependencies by running `pip3 install --target vendor -r requirements.txt` (python3.x). Alternativly set up a python virtual environment.
+2. Execute the command: `python3 cps.py` (or `nohup python3 cps.py` - recommended if you want to exit the terminal window)
 3. Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog
 4. Set `Location of Calibre database` to the path of the folder where your Calibre library (metadata.db) lives, push "submit" button\
    Optionally a Google Drive can be used to host the calibre library [-> Using Google Drive integration](https://github.com/janeczku/calibre-web/wiki/Configuration#using-google-drive-integration)
@@ -48,27 +48,27 @@ Please note that running the above install command can fail on some versions of
 
 ## Requirements
 
-python 3.x+, (Python 2.7+)
+python 3.x+
 
 Optionally, to enable on-the-fly conversion from one ebook format to another when using the send-to-kindle feature, or during editing of ebooks metadata:
 
 [Download and install](https://calibre-ebook.com/download) the Calibre desktop program for your platform and enter the folder including program name (normally /opt/calibre/ebook-convert, or C:\Program Files\calibre\ebook-convert.exe) in the field "calibre's converter tool" on the setup page.
 
-[Download](https://github.com/geek1011/kepubify/releases/tag/v3.1.2) Kepubify tool for your platform and place the binary starting with `kepubify` in Linux: `\opt\kepubify` Windows: `C:\Program Files\kepubify`.
+[Download](https://github.com/pgaskin/kepubify/releases/latest) Kepubify tool for your platform and place the binary starting with `kepubify` in Linux: `\opt\kepubify` Windows: `C:\Program Files\kepubify`.
 
 ## Docker Images
 
 Pre-built Docker images are available in these Docker Hub repositories:
 
 #### **Technosoft2000 - x64**
-+ Docker Hub - [https://hub.docker.com/r/technosoft2000/calibre-web/](https://hub.docker.com/r/technosoft2000/calibre-web/)
++ Docker Hub - [https://hub.docker.com/r/technosoft2000/calibre-web](https://hub.docker.com/r/technosoft2000/calibre-web)
 + Github - [https://github.com/Technosoft2000/docker-calibre-web](https://github.com/Technosoft2000/docker-calibre-web) 
 
     Includes the Calibre `ebook-convert` binary.
     + The "path to convertertool" should be set to `/opt/calibre/ebook-convert`
 
 #### **LinuxServer - x64, armhf, aarch64**
-+ Docker Hub - [https://hub.docker.com/r/linuxserver/calibre-web/](https://hub.docker.com/r/linuxserver/calibre-web/)
++ Docker Hub - [https://hub.docker.com/r/linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web)
 + Github - [https://github.com/linuxserver/docker-calibre-web](https://github.com/linuxserver/docker-calibre-web)
 + Github - (Optional Calibre layer) - [https://github.com/linuxserver/docker-calibre-web/tree/calibre](https://github.com/linuxserver/docker-calibre-web/tree/calibre) 
 
@@ -83,3 +83,7 @@ Pre-built Docker images are available in these Docker Hub repositories:
 # Wiki
 
 For further information, How To's and FAQ please check the [Wiki](https://github.com/janeczku/calibre-web/wiki)
+
+# Contributing to Calibre-Web
+
+Please have a look at our [Contributing Guidelines](https://github.com/janeczku/calibre-web/blob/master/CONTRIBUTING.md) 
diff --git a/cps.py b/cps.py
index 3601e4b6..737b0d97 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,12 +60,17 @@ 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)
+    app.register_blueprint(remotelogin)
+    # if config.config_use_google_drive:
     app.register_blueprint(gdrive)
     app.register_blueprint(editbook)
     if kobo_available:
diff --git a/cps/__init__.py b/cps/__init__.py
index d557649c..627cca0b 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -45,6 +45,7 @@ mimetypes.add_type('application/fb2+zip', '.fb2')
 mimetypes.add_type('application/x-mobipocket-ebook', '.mobi')
 mimetypes.add_type('application/x-mobipocket-ebook', '.prc')
 mimetypes.add_type('application/vnd.amazon.ebook', '.azw')
+mimetypes.add_type('application/x-mobi8-ebook', '.azw3')
 mimetypes.add_type('application/x-cbr', '.cbr')
 mimetypes.add_type('application/x-cbz', '.cbz')
 mimetypes.add_type('application/x-cbt', '.cbt')
@@ -73,7 +74,6 @@ ub.init_db(cli.settingspath)
 # pylint: disable=no-member
 config = config_sql.load_configuration(ub.session)
 
-searched_ids = {}
 web_server = WebServer()
 
 babel = Babel()
@@ -83,6 +83,8 @@ log = logger.create()
 
 from . import services
 
+db.CalibreDB.setup_db(config, cli.settingspath)
+
 calibre_db = db.CalibreDB()
 
 def create_app():
@@ -91,18 +93,20 @@ def create_app():
     if sys.version_info < (3, 0):
         app.static_folder = app.static_folder.decode('utf-8')
         app.root_path = app.root_path.decode('utf-8')
-        app.instance_path = app.instance_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...')
+    if sys.version_info < (3, 0):
+        log.info('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
+        print('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
     Principal(app)
     lm.init_app(app)
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))
 
     web_server.init_app(app, config)
-    calibre_db.setup_db(config, cli.settingspath)
-    calibre_db.start()
 
     babel.init_app(app)
     _BABEL_TRANSLATIONS.update(str(item) for item in babel.list_translations())
diff --git a/cps/about.py b/cps/about.py
index 676d91db..2e9cc699 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:
@@ -48,6 +48,11 @@ try:
 except ImportError:
     flask_danceVersion = None
 
+try:
+    from greenlet import __version__ as greenlet_Version
+except ImportError:
+    greenlet_Version = None
+
 from . import services
 
 about = flask.Blueprint('about', __name__)
@@ -77,11 +82,18 @@ _VERSIONS = OrderedDict(
     python_LDAP = services.ldapVersion if bool(services.ldapVersion) else None,
     Goodreads = u'installed' if bool(services.goodreads_support) else None,
     jsonschema = services.SyncToken.__version__  if bool(services.SyncToken) else None,
-    flask_dance = flask_danceVersion
+    flask_dance = flask_danceVersion,
+    greenlet = greenlet_Version
 )
 _VERSIONS.update(uploader.get_versions())
 
 
+def collect_stats():
+    _VERSIONS['ebook converter'] = _(converter.get_calibre_version())
+    _VERSIONS['unrar'] = _(converter.get_unrar_version())
+    _VERSIONS['kepubify'] = _(converter.get_kepubify_version())
+    return _VERSIONS
+
 @about.route("/stats")
 @flask_login.login_required
 def stats():
@@ -89,8 +101,7 @@ def stats():
     authors = calibre_db.session.query(db.Authors).count()
     categorys = calibre_db.session.query(db.Tags).count()
     series = calibre_db.session.query(db.Series).count()
-    _VERSIONS['ebook converter'] = _(converter.get_calibre_version())
-    _VERSIONS['unrar'] = _(converter.get_unrar_version())
-    _VERSIONS['kepubify'] = _(converter.get_kepubify_version())
-    return render_title_template('stats.html', bookcounter=counter, authorcounter=authors, versions=_VERSIONS,
+    return render_title_template('stats.html', bookcounter=counter, authorcounter=authors, versions=collect_stats(),
                                  categorycounter=categorys, seriecounter=series, title=_(u"Statistics"), page="stat")
+
+
diff --git a/cps/admin.py b/cps/admin.py
index 424a12b4..b932bd8e 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,35 +26,45 @@ 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, login_required_if_no_ano
+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 = {
         'ldap': bool(services.ldap),
         'goodreads': bool(services.goodreads_support),
-        'kobo':  bool(services.kobo)
+        'kobo':  bool(services.kobo),
+        'updater': constants.UPDATER_AVAILABLE
     }
 
 try:
+    # pylint: disable=unused-import
     import rarfile
     feature_support['rar'] = True
-except ImportError:
+except (ImportError, SyntaxError):
     feature_support['rar'] = False
 
 try:
@@ -71,6 +81,52 @@ 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 '/static/' not in request.path and not config.db_configured and \
+        request.endpoint not in ('admin.basic_configuration',
+                                 'login',
+                                 'admin.config_pathchooser'):
+        return redirect(url_for('admin.basic_configuration'))
+
 
 @admi.route("/admin")
 @login_required
@@ -129,10 +185,11 @@ def admin():
         else:
             commit = version['version']
 
-    allUser = ub.session.query(ub.User).all()
+    all_user = ub.session.query(ub.User).all()
     email_settings = config.get_mail_settings()
-    return render_title_template("admin.html", allUser=allUser, email=email_settings, config=config, commit=commit,
-                                 feature_support=feature_support,
+    kobo_support = feature_support['kobo'] and config.config_kobo_sync
+    return render_title_template("admin.html", allUser=all_user, email=email_settings, config=config, commit=commit,
+                                 feature_support=feature_support, kobo_support=kobo_support,
                                  title=_(u"Admin page"), page="admin")
 
 
@@ -141,7 +198,7 @@ def admin():
 @admin_required
 def configuration():
     if request.method == "POST":
-        return _configuration_update_helper()
+        return _configuration_update_helper(True)
     return _configuration_result()
 
 
@@ -149,12 +206,12 @@ def configuration():
 @login_required
 @admin_required
 def view_configuration():
-    readColumn = calibre_db.session.query(db.Custom_Columns)\
-            .filter(and_(db.Custom_Columns.datatype == 'bool', db.Custom_Columns.mark_for_delete == 0)).all()
-    restrictColumns= calibre_db.session.query(db.Custom_Columns)\
-            .filter(and_(db.Custom_Columns.datatype == 'text', db.Custom_Columns.mark_for_delete == 0)).all()
-    return render_title_template("config_view_edit.html", conf=config, readColumns=readColumn,
-                                 restrictColumns=restrictColumns,
+    read_column = calibre_db.session.query(db.Custom_Columns)\
+        .filter(and_(db.Custom_Columns.datatype == 'bool', db.Custom_Columns.mark_for_delete == 0)).all()
+    restrict_columns = calibre_db.session.query(db.Custom_Columns)\
+        .filter(and_(db.Custom_Columns.datatype == 'text', db.Custom_Columns.mark_for_delete == 0)).all()
+    return render_title_template("config_view_edit.html", conf=config, readColumns=read_column,
+                                 restrictColumns=restrict_columns,
                                  title=_(u"UI Configuration"), page="uiconfig")
 
 
@@ -162,7 +219,6 @@ def view_configuration():
 @login_required
 @admin_required
 def update_view_configuration():
-    reboot_required = False
     to_save = request.form.to_dict()
 
     _config_string = lambda x: config.set_from_dictionary(to_save, x, lambda y: y.strip() if y else y)
@@ -170,7 +226,8 @@ def update_view_configuration():
 
     _config_string("config_calibre_web_title")
     _config_string("config_columns_to_ignore")
-    reboot_required |= _config_string("config_title_regex")
+    if _config_string("config_title_regex"):
+        calibre_db.update_title_sort(config)
 
     _config_int("config_read_column")
     _config_int("config_theme")
@@ -189,14 +246,25 @@ def update_view_configuration():
     config.save()
     flash(_(u"Calibre-Web configuration updated"), category="success")
     before_request()
-    if reboot_required:
-        db.dispose()
-        ub.dispose()
-        web_server.stop(True)
 
     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
@@ -208,8 +276,7 @@ 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()
-    return ""
+    return ub.session_commit("Registering Domains edited {}".format(answer.domain))
 
 
 @admi.route("/ajax/adddomain/<int:allow>", methods=['POST'])
@@ -217,11 +284,12 @@ def edit_domain(allow):
 @admin_required
 def add_domain(allow):
     domain_name = request.form.to_dict()['domainname'].replace('*', '%').replace('?', '_').lower()
-    check = ub.session.query(ub.Registration).filter(ub.Registration.domain == domain_name).filter(ub.Registration.allow == allow).first()
+    check = ub.session.query(ub.Registration).filter(ub.Registration.domain == domain_name)\
+        .filter(ub.Registration.allow == allow).first()
     if not check:
         new_domain = ub.Registration(domain=domain_name, allow=allow)
         ub.session.add(new_domain)
-        ub.session.commit()
+        ub.session_commit("Registering Domains added {}".format(domain_name))
     return ""
 
 
@@ -229,14 +297,17 @@ 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()
+        ub.session_commit("Registering Domains deleted {}".format(domain_id))
+        # 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("Last Registering Domain deleted, added *.* as default")
+    except KeyError:
+        pass
     return ""
 
 
@@ -251,75 +322,74 @@ 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
             elementlist = config.list_allowed_tags()
-            elementlist[int(element['id'][1:])]=element['Element']
+            elementlist[int(element['id'][1:])] = element['Element']
             config.config_allowed_tags = ','.join(elementlist)
             config.save()
         if res_type == 1:  # CustomC
             elementlist = config.list_allowed_column_values()
-            elementlist[int(element['id'][1:])]=element['Element']
+            elementlist[int(element['id'][1:])] = element['Element']
             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']
+            elementlist[int(element['id'][1:])] = element['Element']
             usr.allowed_tags = ','.join(elementlist)
-            ub.session.commit()
+            ub.session_commit("Changed allowed tags of user {} to {}".format(usr.nickname, usr.allowed_tags))
         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']
+            elementlist[int(element['id'][1:])] = element['Element']
             usr.allowed_column_value = ','.join(elementlist)
-            ub.session.commit()
+            ub.session_commit("Changed allowed columns of user {} to {}".format(usr.nickname, usr.allowed_column_value))
     if element['id'].startswith('d'):
         if res_type == 0:  # Tags as template
             elementlist = config.list_denied_tags()
-            elementlist[int(element['id'][1:])]=element['Element']
+            elementlist[int(element['id'][1:])] = element['Element']
             config.config_denied_tags = ','.join(elementlist)
             config.save()
         if res_type == 1:  # CustomC
             elementlist = config.list_denied_column_values()
-            elementlist[int(element['id'][1:])]=element['Element']
+            elementlist[int(element['id'][1:])] = element['Element']
             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']
+            elementlist[int(element['id'][1:])] = element['Element']
             usr.denied_tags = ','.join(elementlist)
-            ub.session.commit()
+            ub.session_commit("Changed denied tags of user {} to {}".format(usr.nickname, usr.denied_tags))
         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']
+            elementlist[int(element['id'][1:])] = element['Element']
             usr.denied_column_value = ','.join(elementlist)
-            ub.session.commit()
+            ub.session_commit("Changed denied columns of user {} to {}".format(usr.nickname, usr.denied_column_value))
     return ""
 
+
 def restriction_addition(element, list_func):
     elementlist = list_func()
     if elementlist == ['']:
@@ -336,10 +406,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:
@@ -356,35 +427,37 @@ 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()
+            ub.session_commit("Changed allowed tags of user {} to {}".format(usr.nickname, usr.list_allowed_tags))
         elif 'submit_deny' in element:
             usr.denied_tags = restriction_addition(element, usr.list_denied_tags)
-            ub.session.commit()
+            ub.session_commit("Changed denied tags of user {} to {}".format(usr.nickname, usr.list_denied_tags))
     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()
+            ub.session_commit("Changed allowed columns of user {} to {}".format(usr.nickname,
+                                                                                usr.list_allowed_column_values))
         elif 'submit_deny' in element:
             usr.denied_column_value = restriction_addition(element, usr.list_denied_column_values)
-            ub.session.commit()
+            ub.session_commit("Changed denied columns of user {} to {}".format(usr.nickname,
+                                                                               usr.list_denied_column_values))
     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'):
@@ -401,85 +474,182 @@ 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()
+            ub.session_commit("Deleted allowed tags of user {}: {}".format(usr.nickname, usr.list_allowed_tags))
         elif element['id'].startswith('d'):
             usr.denied_tags = restriction_deletion(element, usr.list_denied_tags)
-            ub.session.commit()
+            ub.session_commit("Deleted denied tags of user {}: {}".format(usr.nickname, usr.list_allowed_tags))
     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()
+            ub.session_commit("Deleted allowed columns of user {}: {}".format(usr.nickname,
+                                                                              usr.list_allowed_column_values))
+
         elif element['id'].startswith('d'):
             usr.denied_column_value = restriction_deletion(element, usr.list_denied_column_values)
-            ub.session.commit()
+            ub.session_commit("Deleted denied columns of user {}: {}".format(usr.nickname,
+                                                                             usr.list_denied_column_values))
     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 != '' ]
-        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
-                 for i,x in enumerate(config.list_allowed_tags()) if x != '']
+                    for i,x in enumerate(config.list_denied_tags()) if x != '']
+        allow = [{'Element': x, 'type': _('Allow'), 'id': 'a'+str(i)}
+                 for i, x in enumerate(config.list_allowed_tags()) if x != '']
         json_dumps = restrict + allow
     elif res_type == 1:  # CustomC as template
-        restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
-                    for i,x in enumerate(config.list_denied_column_values()) if x != '' ]
-        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
-                 for i,x in enumerate(config.list_allowed_column_values()) if x != '']
+        restrict = [{'Element': x, 'type': _('Deny'), 'id': 'd'+str(i)}
+                    for i, x in enumerate(config.list_denied_column_values()) if x != '']
+        allow = [{'Element': x, 'type': _('Allow'), 'id': 'a'+str(i)}
+                 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) }
-                    for i,x in enumerate(usr.list_denied_tags()) if x != '' ]
-        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
-                 for i,x in enumerate(usr.list_allowed_tags()) if x != '']
+        restrict = [{'Element': x, 'type': _('Deny'), 'id': 'd'+str(i)}
+                    for i, x in enumerate(usr.list_denied_tags()) if x != '']
+        allow = [{'Element': x, 'type': _('Allow'), 'id': 'a'+str(i)}
+                 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) }
-                    for i,x in enumerate(usr.list_denied_column_values()) if x != '' ]
-        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
-                 for i,x in enumerate(usr.list_allowed_column_values()) if x != '']
+        restrict = [{'Element': x, 'type': _('Deny'), 'id': 'd'+str(i)}
+                    for i, x in enumerate(usr.list_denied_column_values()) if x != '']
+        allow = [{'Element': x, 'type': _('Allow'), 'id': 'a'+str(i)}
+                 for i, x in enumerate(usr.list_allowed_column_values()) if x != '']
         json_dumps = restrict + allow
     else:
-        json_dumps=""
+        json_dumps = ""
     js = json.dumps(json_dumps)
     response = make_response(js.replace("'", '"'))
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
 
-@admi.route("/config", methods=["GET", "POST"])
+@admi.route("/basicconfig/pathchooser/")
+@unconfigured
+def config_pathchooser():
+    if filepicker:
+        return pathchooser()
+    abort(403)
+
+
+@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 = ""
+
+    absolute = False
+
+    if os.path.isdir(path):
+        # if os.path.isabs(path):
+        cwd = os.path.realpath(path)
+        absolute = 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 absolute:
+        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": absolute,
+    }
+    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):
@@ -503,8 +673,8 @@ def _configuration_gdrive_helper(to_save):
         config.config_use_google_drive = False
 
     gdrive_secrets = {}
-    gdriveError = gdriveutils.get_error_text(gdrive_secrets)
-    if "config_use_google_drive" in to_save and not config.config_use_google_drive and not gdriveError:
+    gdrive_error = gdriveutils.get_error_text(gdrive_secrets)
+    if "config_use_google_drive" in to_save and not config.config_use_google_drive and not gdrive_error:
         with open(gdriveutils.CLIENT_SECRETS, 'r') as settings:
             gdrive_secrets = json.load(settings)['web']
         if not gdrive_secrets:
@@ -516,10 +686,11 @@ def _configuration_gdrive_helper(to_save):
                         )
 
     # always show google drive settings, but in case of error deny support
-    config.config_use_google_drive = (not gdriveError) and ("config_use_google_drive" in to_save)
+    config.config_use_google_drive = (not gdrive_error) and ("config_use_google_drive" in to_save)
     if _config_string(to_save, "config_google_drive_folder"):
         gdriveutils.deleteDatabaseOnChange()
-    return gdriveError
+    return gdrive_error
+
 
 def _configuration_oauth_helper(to_save):
     active_oauths = 0
@@ -542,20 +713,87 @@ def _configuration_oauth_helper(to_save):
              "active": element["active"]})
     return reboot_required
 
-def _configuration_logfile_helper(to_save, gdriveError):
+
+def _configuration_logfile_helper(to_save, gdrive_error):
     reboot_required = False
     reboot_required |= _config_int(to_save, "config_log_level")
     reboot_required |= _config_string(to_save, "config_logfile")
     if not logger.is_valid_logfile(config.config_logfile):
-        return reboot_required, _configuration_result(_('Logfile Location is not Valid, Please Enter Correct Path'), gdriveError)
+        return reboot_required, \
+               _configuration_result(_('Logfile Location is not Valid, Please Enter Correct Path'), gdrive_error)
 
     reboot_required |= _config_checkbox_int(to_save, "config_access_log")
     reboot_required |= _config_string(to_save, "config_access_logfile")
     if not logger.is_valid_logfile(config.config_access_logfile):
-        return reboot_required, _configuration_result(_('Access Logfile Location is not Valid, Please Enter Correct Path'), gdriveError)
+        return reboot_required, \
+               _configuration_result(_('Access Logfile Location is not Valid, Please Enter Correct Path'), gdrive_error)
     return reboot_required, None
 
-def _configuration_ldap_helper(to_save, gdriveError):
+
+def _configuration_ldap_check(reboot_required, to_save, gdrive_error):
+    if not config.config_ldap_provider_url \
+       or not config.config_ldap_port \
+       or not config.config_ldap_dn \
+       or not config.config_ldap_user_object:
+        return reboot_required, _configuration_result(_('Please Enter a LDAP Provider, '
+                                                        'Port, DN and User Object Identifier'), gdrive_error)
+    if config.config_ldap_authentication > constants.LDAP_AUTH_ANONYMOUS:
+        if config.config_ldap_authentication > constants.LDAP_AUTH_UNAUTHENTICATE:
+            if not config.config_ldap_serv_username or not bool(config.config_ldap_serv_password):
+                return reboot_required, _configuration_result('Please Enter a LDAP Service Account and Password',
+                                                              gdrive_error)
+        else:
+            if not config.config_ldap_serv_username:
+                return reboot_required, _configuration_result('Please Enter a LDAP Service Account', gdrive_error)
+
+    if config.config_ldap_group_object_filter:
+        if config.config_ldap_group_object_filter.count("%s") != 1:
+            return reboot_required, \
+                   _configuration_result(_('LDAP Group Object Filter Needs to Have One "%s" Format Identifier'),
+                                         gdrive_error)
+        if config.config_ldap_group_object_filter.count("(") != config.config_ldap_group_object_filter.count(")"):
+            return reboot_required, _configuration_result(_('LDAP Group Object Filter Has Unmatched Parenthesis'),
+                                                          gdrive_error)
+    if config.config_ldap_group_object_filter:
+        if config.config_ldap_group_object_filter.count("%s") != 1:
+            return reboot_required, \
+                   _configuration_result(_('LDAP Group Object Filter Needs to Have One "%s" Format Identifier'),
+                                         gdrive_error)
+        if config.config_ldap_group_object_filter.count("(") != config.config_ldap_group_object_filter.count(")"):
+            return reboot_required, _configuration_result(_('LDAP Group Object Filter Has Unmatched Parenthesis'),
+                                                          gdrive_error)
+
+    if config.config_ldap_user_object.count("%s") != 1:
+        return reboot_required, \
+               _configuration_result(_('LDAP User Object Filter needs to Have One "%s" Format Identifier'),
+                                     gdrive_error)
+    if config.config_ldap_user_object.count("(") != config.config_ldap_user_object.count(")"):
+        return reboot_required, _configuration_result(_('LDAP User Object Filter Has Unmatched Parenthesis'),
+                                                      gdrive_error)
+
+    if to_save["ldap_import_user_filter"] == '0':
+        config.config_ldap_member_user_object = ""
+    else:
+        if config.config_ldap_member_user_object.count("%s") != 1:
+            return reboot_required, \
+                   _configuration_result(_('LDAP Member User Filter needs to Have One "%s" Format Identifier'),
+                                         gdrive_error)
+        if config.config_ldap_member_user_object.count("(") != config.config_ldap_member_user_object.count(")"):
+            return reboot_required, _configuration_result(_('LDAP Member User Filter Has Unmatched Parenthesis'),
+                                                          gdrive_error)
+
+    if config.config_ldap_cacert_path or config.config_ldap_cert_path or config.config_ldap_key_path:
+        if not (os.path.isfile(config.config_ldap_cacert_path) and
+                os.path.isfile(config.config_ldap_cert_path) and
+                os.path.isfile(config.config_ldap_key_path)):
+            return reboot_required, \
+                   _configuration_result(_('LDAP CACertificate, Certificate or Key Location is not Valid, '
+                                           'Please Enter Correct Path'),
+                                         gdrive_error)
+    return reboot_required, None
+
+
+def _configuration_ldap_helper(to_save, gdrive_error):
     reboot_required = False
     reboot_required |= _config_string(to_save, "config_ldap_provider_url")
     reboot_required |= _config_int(to_save, "config_ldap_port")
@@ -565,84 +803,66 @@ def _configuration_ldap_helper(to_save, gdriveError):
     reboot_required |= _config_string(to_save, "config_ldap_user_object")
     reboot_required |= _config_string(to_save, "config_ldap_group_object_filter")
     reboot_required |= _config_string(to_save, "config_ldap_group_members_field")
+    reboot_required |= _config_string(to_save, "config_ldap_member_user_object")
     reboot_required |= _config_checkbox(to_save, "config_ldap_openldap")
     reboot_required |= _config_int(to_save, "config_ldap_encryption")
+    reboot_required |= _config_string(to_save, "config_ldap_cacert_path")
     reboot_required |= _config_string(to_save, "config_ldap_cert_path")
+    reboot_required |= _config_string(to_save, "config_ldap_key_path")
     _config_string(to_save, "config_ldap_group_name")
     if "config_ldap_serv_password" in to_save and to_save["config_ldap_serv_password"] != "":
         reboot_required |= 1
         config.set_from_dictionary(to_save, "config_ldap_serv_password", base64.b64encode, encode='UTF-8')
     config.save()
 
-    if not config.config_ldap_provider_url \
-        or not config.config_ldap_port \
-        or not config.config_ldap_dn \
-        or not config.config_ldap_user_object:
-        return reboot_required, _configuration_result(_('Please Enter a LDAP Provider, '
-                                       'Port, DN and User Object Identifier'), gdriveError)
-
-    if config.config_ldap_authentication > constants.LDAP_AUTH_ANONYMOUS:
-        if config.config_ldap_authentication > constants.LDAP_AUTH_UNAUTHENTICATE:
-            if not config.config_ldap_serv_username or not bool(config.config_ldap_serv_password):
-                return reboot_required, _configuration_result('Please Enter a LDAP Service Account and Password', gdriveError)
-        else:
-            if not config.config_ldap_serv_username:
-                return reboot_required, _configuration_result('Please Enter a LDAP Service Account', gdriveError)
-
-    if config.config_ldap_group_object_filter:
-        if config.config_ldap_group_object_filter.count("%s") != 1:
-            return reboot_required, _configuration_result(_('LDAP Group Object Filter Needs to Have One "%s" Format Identifier'),
-                                         gdriveError)
-        if config.config_ldap_group_object_filter.count("(") != config.config_ldap_group_object_filter.count(")"):
-            return reboot_required, _configuration_result(_('LDAP Group Object Filter Has Unmatched Parenthesis'),
-                                         gdriveError)
-
-    if config.config_ldap_user_object.count("%s") != 1:
-        return reboot_required, _configuration_result(_('LDAP User Object Filter needs to Have One "%s" Format Identifier'),
-                                     gdriveError)
-    if config.config_ldap_user_object.count("(") != config.config_ldap_user_object.count(")"):
-        return reboot_required, _configuration_result(_('LDAP User Object Filter Has Unmatched Parenthesis'),
-                                     gdriveError)
-
-    if config.config_ldap_cert_path and not os.path.isdir(config.config_ldap_cert_path):
-        return reboot_required, _configuration_result(_('LDAP Certificate Location is not Valid, Please Enter Correct Path'),
-                                     gdriveError)
-    return reboot_required, None
+    return _configuration_ldap_check(reboot_required, to_save, gdrive_error)
 
 
-def _configuration_update_helper():
+def _configuration_update_helper(configured):
     reboot_required = False
     db_change = False
     to_save = request.form.to_dict()
-    gdriveError = None
+    gdrive_error = None
 
-    to_save['config_calibre_dir'] = re.sub('[\\/]metadata\.db$', '', to_save['config_calibre_dir'], flags=re.IGNORECASE)
+    to_save['config_calibre_dir'] = re.sub(r'[\\/]metadata\.db$',
+                                           '',
+                                           to_save['config_calibre_dir'],
+                                           flags=re.IGNORECASE)
     try:
         db_change |= _config_string(to_save, "config_calibre_dir")
 
-        # Google drive setup
-        gdriveError = _configuration_gdrive_helper(to_save)
+        # gdrive_error drive setup
+        gdrive_error = _configuration_gdrive_helper(to_save)
 
         reboot_required |= _config_int(to_save, "config_port")
 
         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'),
+                                         gdrive_error,
+                                         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'),
+                                         gdrive_error,
+                                         configured)
 
         _config_checkbox_int(to_save, "config_uploading")
-        _config_checkbox_int(to_save, "config_anonbrowse")
+        # Reboot on config_anonbrowse with enabled ldap, as decoraters are changed in this case
+        reboot_required |= (_config_checkbox_int(to_save, "config_anonbrowse")
+                             and config.config_login_type == constants.LOGIN_LDAP)
         _config_checkbox_int(to_save, "config_public_reg")
         _config_checkbox_int(to_save, "config_register_email")
         reboot_required |= _config_checkbox_int(to_save, "config_kobo_sync")
         _config_int(to_save, "config_external_port")
         _config_checkbox_int(to_save, "config_kobo_proxy")
 
-        _config_string(to_save, "config_upload_formats")
-        constants.EXTENSIONS_UPLOAD = [x.lstrip().rstrip() for x in config.config_upload_formats.split(',')]
+        if "config_upload_formats" in to_save:
+            to_save["config_upload_formats"] = ','.join(
+                helper.uniq([x.lstrip().rstrip().lower() for x in to_save["config_upload_formats"].split(',')]))
+            _config_string(to_save, "config_upload_formats")
+            constants.EXTENSIONS_UPLOAD = config.config_upload_formats.split(',')
 
         _config_string(to_save, "config_calibre")
         _config_string(to_save, "config_converterpath")
@@ -650,9 +870,9 @@ def _configuration_update_helper():
 
         reboot_required |= _config_int(to_save, "config_login_type")
 
-        #LDAP configurator,
+        # LDAP configurator,
         if config.config_login_type == constants.LOGIN_LDAP:
-            reboot, message = _configuration_ldap_helper(to_save, gdriveError)
+            reboot, message = _configuration_ldap_helper(to_save, gdrive_error)
             if message:
                 return message
             reboot_required |= reboot
@@ -661,7 +881,7 @@ def _configuration_update_helper():
 
         _config_checkbox(to_save, "config_remote_login")
         if not config.config_remote_login:
-            ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.token_type==0).delete()
+            ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.token_type == 0).delete()
 
         # Goodreads configuration
         _config_checkbox(to_save, "config_use_goodreads")
@@ -682,7 +902,7 @@ def _configuration_update_helper():
         if config.config_login_type == constants.LOGIN_OAUTH:
             reboot_required |= _configuration_oauth_helper(to_save)
 
-        reboot, message = _configuration_logfile_helper(to_save, gdriveError)
+        reboot, message = _configuration_logfile_helper(to_save, gdrive_error)
         if message:
             return message
         reboot_required |= reboot
@@ -691,10 +911,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, gdrive_error, configured)
     except (OperationalError, InvalidRequestError):
         ub.session.rollback()
-        _configuration_result(_(u"Settings DB is not Writeable"), gdriveError)
+        _configuration_result(_(u"Settings DB is not Writeable"), gdrive_error, configured)
 
     try:
         metadata_db = os.path.join(config.config_calibre_dir, "metadata.db")
@@ -702,11 +922,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, gdrive_error, 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'),
+                                         gdrive_error,
+                                         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")
 
@@ -715,16 +937,16 @@ def _configuration_update_helper():
     if reboot_required:
         web_server.stop(True)
 
-    return _configuration_result(None, gdriveError)
+    return _configuration_result(None, gdrive_error, configured)
 
 
-def _configuration_result(error_flash=None, gdriveError=None):
+def _configuration_result(error_flash=None, gdrive_error=None, configured=True):
     gdrive_authenticate = not is_gdrive_ready()
     gdrivefolders = []
-    if gdriveError is None:
-        gdriveError = gdriveutils.get_error_text()
-    if gdriveError:
-        gdriveError = _(gdriveError)
+    if gdrive_error is None:
+        gdrive_error = gdriveutils.get_error_text()
+    if gdrive_error:
+        gdrive_error = _(gdrive_error)
     else:
         # if config.config_use_google_drive and\
         if not gdrive_authenticate and gdrive_support:
@@ -737,14 +959,20 @@ def _configuration_result(error_flash=None, gdriveError=None):
         flash(error_flash, category="error")
         show_login_button = False
 
-    return render_title_template("config_edit.html", config=config, provider=oauthblueprints,
-                                 show_back_button=show_back_button, show_login_button=show_login_button,
+    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,
-                                 gdriveError=gdriveError, gdrivefolders=gdrivefolders, feature_support=feature_support,
+                                 filepicker=configured,
+                                 gdriveError=gdrive_error,
+                                 gdrivefolders=gdrivefolders,
+                                 feature_support=feature_support,
                                  title=_(u"Basic Configuration"), page="config")
 
 
-def _handle_new_user(to_save, content,languages, translations, kobo_support):
+def _handle_new_user(to_save, content, languages, translations, kobo_support):
     content.default_language = to_save["default_language"]
     # content.mature_content = "Show_mature_content" in to_save
     content.locale = to_save.get("locale", content.locale)
@@ -795,22 +1023,36 @@ def _handle_new_user(to_save, content,languages, translations, kobo_support):
         ub.session.rollback()
         flash(_(u"Settings DB is not Writeable"), category="error")
 
+def delete_user(content):
+    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()
+        flash(_(u"User '%(nick)s' deleted", nick=content.nickname), category="success")
+        return redirect(url_for('admin.admin'))
+    else:
+        flash(_(u"No admin user remaining, can't delete user", nick=content.nickname), category="error")
+        return redirect(url_for('admin.admin'))
 
-def _handle_edit_user(to_save, content,languages, translations, kobo_support, downloads):
+
+def save_edited_user(content):
+    try:
+        ub.session_commit()
+        flash(_(u"User '%(nick)s' updated", nick=content.nickname), category="success")
+    except IntegrityError:
+        ub.session.rollback()
+        flash(_(u"An unknown error occured."), category="error")
+    except OperationalError:
+        ub.session.rollback()
+        flash(_(u"Settings DB is not Writeable"), category="error")
+
+
+def _handle_edit_user(to_save, content, languages, translations, kobo_support):
     if "delete" in to_save:
-        if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
-                                            ub.User.id != content.id).count():
-            ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
-            ub.session.commit()
-            flash(_(u"User '%(nick)s' deleted", nick=content.nickname), category="success")
-            return redirect(url_for('admin.admin'))
-        else:
-            flash(_(u"No admin user remaining, can't delete user", nick=content.nickname), category="error")
-            return redirect(url_for('admin.admin'))
+        return delete_user(content)
     else:
         if not ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
-                                                ub.User.id != content.id).count() and \
-            not 'admin_role' in to_save:
+                                                ub.User.id != content.id).count() and 'admin_role' not in to_save:
             flash(_(u"No admin user remaining, can't remove admin role", nick=content.nickname), category="error")
             return redirect(url_for('admin.admin'))
 
@@ -824,12 +1066,12 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support, do
             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):
                 content.sidebar_view |= value
-            elif not value in val and content.check_visibility(value):
+            elif value not in val and content.check_visibility(value):
                 content.sidebar_view &= ~value
 
         if "Show_detail_random" in to_save:
@@ -855,7 +1097,6 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support, do
                                              kobo_support=kobo_support,
                                              new_user=0,
                                              content=content,
-                                             downloads=downloads,
                                              registered_oauth=oauth_check,
                                              title=_(u"Edit User %(nick)s", nick=content.nickname), page="edituser")
         if "nickname" in to_save and to_save["nickname"] != content.nickname:
@@ -869,7 +1110,6 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support, do
                                              languages=languages,
                                              mail_configured=config.get_mail_server_configured(),
                                              new_user=0, content=content,
-                                             downloads=downloads,
                                              registered_oauth=oauth_check,
                                              kobo_support=kobo_support,
                                              title=_(u"Edit User %(nick)s", nick=content.nickname),
@@ -877,15 +1117,7 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support, do
 
         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()
-        flash(_(u"User '%(nick)s' updated", nick=content.nickname), category="success")
-    except IntegrityError:
-        ub.session.rollback()
-        flash(_(u"An unknown error occured."), category="error")
-    except OperationalError:
-        ub.session.rollback()
-        flash(_(u"Settings DB is not Writeable"), category="error")
+    return save_edited_user(content)
 
 
 @admi.route("/admin/user/new", methods=["GET", "POST"])
@@ -958,28 +1190,20 @@ def update_mailsettings():
 @admin_required
 def edit_user(user_id):
     content = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()  # type: ub.User
-    if not content:
+    if not content or (not config.config_anonbrowse and content.nickname == "Guest"):
         flash(_(u"User not found"), category="error")
         return redirect(url_for('admin.admin'))
-    downloads = list()
     languages = calibre_db.speaking_language()
     translations = babel.list_translations() + [LC('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    for book in content.downloads:
-        downloadbook = calibre_db.get_book(book.book_id)
-        if downloadbook:
-            downloads.append(downloadbook)
-        else:
-            ub.delete_download(book.book_id)
     if request.method == "POST":
         to_save = request.form.to_dict()
-        _handle_edit_user(to_save, content, languages, translations, kobo_support, downloads)
+        _handle_edit_user(to_save, content, languages, translations, kobo_support)
     return render_title_template("user_edit.html",
                                  translations=translations,
                                  languages=languages,
                                  new_user=0,
                                  content=content,
-                                 downloads=downloads,
                                  registered_oauth=oauth_check,
                                  mail_configured=config.get_mail_server_configured(),
                                  kobo_support=kobo_support,
@@ -1008,9 +1232,8 @@ def reset_user_password(user_id):
 @login_required
 @admin_required
 def view_logfile():
-    logfiles = {}
-    logfiles[0] = logger.get_logfile(config.config_logfile)
-    logfiles[1] = logger.get_accesslogfile(config.config_access_logfile)
+    logfiles = {0: logger.get_logfile(config.config_logfile),
+                1: logger.get_accesslogfile(config.config_access_logfile)}
     return render_title_template("logviewer.html",
                                  title=_(u"Logfile viewer"),
                                  accesslog_enable=config.config_access_log,
@@ -1035,11 +1258,37 @@ def send_logfile(logtype):
         return ""
 
 
+@admi.route("/admin/logdownload/<int:logtype>")
+@login_required
+@admin_required
+def download_log(logtype):
+    if logtype == 0:
+        file_name = logger.get_logfile(config.config_logfile)
+    elif logtype == 1:
+        file_name = logger.get_accesslogfile(config.config_access_logfile)
+    else:
+        abort(404)
+    if logger.is_valid_logfile(file_name):
+        return debug_info.assemble_logfiles(file_name)
+    abort(404)
+
+
+@admi.route("/admin/debug")
+@login_required
+@admin_required
+def download_debug():
+    return debug_info.send_debug()
+
+
 @admi.route("/get_update_status", methods=['GET'])
-@login_required_if_no_ano
+@login_required
+@admin_required
 def get_update_status():
-    log.info(u"Update status requested")
-    return updater_thread.get_available_updates(request.method, locale=get_locale())
+    if feature_support['updater']:
+        log.info(u"Update status requested")
+        return updater_thread.get_available_updates(request.method, locale=get_locale())
+    else:
+        return ''
 
 
 @admi.route("/get_updater_status", methods=['GET', 'POST'])
@@ -1047,32 +1296,156 @@ def get_update_status():
 @admin_required
 def get_updater_status():
     status = {}
-    if request.method == "POST":
-        commit = request.form.to_dict()
-        if "start" in commit and commit['start'] == 'True':
-            text = {
-                "1": _(u'Requesting update package'),
-                "2": _(u'Downloading update package'),
-                "3": _(u'Unzipping update package'),
-                "4": _(u'Replacing files'),
-                "5": _(u'Database connections are closed'),
-                "6": _(u'Stopping server'),
-                "7": _(u'Update finished, please press okay and reload page'),
-                "8": _(u'Update failed:') + u' ' + _(u'HTTP Error'),
-                "9": _(u'Update failed:') + u' ' + _(u'Connection error'),
-                "10": _(u'Update failed:') + u' ' + _(u'Timeout while establishing connection'),
-                "11": _(u'Update failed:') + u' ' + _(u'General error'),
-                "12": _(u'Update failed:') + u' ' + _(u'Update File Could Not be Saved in Temp Dir')
-            }
-            status['text'] = text
-            updater_thread.status = 0
-            updater_thread.resume()
-            status['status'] = updater_thread.get_update_status()
-    elif request.method == "GET":
+    if feature_support['updater']:
+        if request.method == "POST":
+            commit = request.form.to_dict()
+            if "start" in commit and commit['start'] == 'True':
+                text = {
+                    "1": _(u'Requesting update package'),
+                    "2": _(u'Downloading update package'),
+                    "3": _(u'Unzipping update package'),
+                    "4": _(u'Replacing files'),
+                    "5": _(u'Database connections are closed'),
+                    "6": _(u'Stopping server'),
+                    "7": _(u'Update finished, please press okay and reload page'),
+                    "8": _(u'Update failed:') + u' ' + _(u'HTTP Error'),
+                    "9": _(u'Update failed:') + u' ' + _(u'Connection error'),
+                    "10": _(u'Update failed:') + u' ' + _(u'Timeout while establishing connection'),
+                    "11": _(u'Update failed:') + u' ' + _(u'General error'),
+                    "12": _(u'Update failed:') + u' ' + _(u'Update File Could Not be Saved in Temp Dir')
+                }
+                status['text'] = text
+                updater_thread.status = 0
+                updater_thread.resume()
+                status['status'] = updater_thread.get_update_status()
+        elif request.method == "GET":
+            try:
+                status['status'] = updater_thread.get_update_status()
+                if status['status'] == -1:
+                    status['status'] = 7
+            except Exception:
+                status['status'] = 11
+        return json.dumps(status)
+    return ''
+
+
+def create_ldap_user(user, user_data, config):
+    imported = 0
+    showtext = None
+
+    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)
+        return imported, showtext
+
+    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)
+        return imported, showtext
+
+    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 = _(u'Failed to Create at Least One LDAP User')
+    return imported, showtext
+
+
+@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:
-            status['status'] = updater_thread.get_update_status()
-            if status['status']  == -1:
-                status['status'] = 7
-        except Exception:
-            status['status'] = 11
-    return json.dumps(status)
+            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:
+            success, txt = create_ldap_user(user, user_data, config)
+            # In case of error store text for showing it
+            if txt:
+                showtext['text'] = txt
+            imported += success
+        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 + r"=([\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, filtr):
+    match = re.search("([a-zA-Z0-9-]+)=%s", filtr, re.IGNORECASE | re.UNICODE)
+    if match:
+        return match.group(1)
+    else:
+        raise Exception("Could Not Parse LDAP Userfield: {}", user)
+
+
+def extract_user_identifier(user, filtr):
+    dynamic_field = extract_dynamic_field_from_filter(user, filtr)
+    return extract_user_data_from_field(user, dynamic_field)
diff --git a/cps/cli.py b/cps/cli.py
index c94cb89d..07b719d2 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):
@@ -109,4 +110,10 @@ if ipadress:
         sys.exit(1)
 
 # handle and check user password argument
-user_password = args.s or None
+user_credentials = args.s or None
+if user_credentials and ":" not in user_credentials:
+    print("No valid username:password format")
+    sys.exit(3)
+
+# Handles enableing of filepicker
+filepicker = args.f or None
diff --git a/cps/comic.py b/cps/comic.py
index e788fc44..c2b30197 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -18,27 +18,27 @@
 
 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
     try:
         from comicapi import __version__ as comic_version
-    except (ImportError):
+    except ImportError:
         comic_version = ''
 except (ImportError, LookupError) as e:
     log.debug('Cannot import comicapi, extracting comic metadata will not work: %s', e)
@@ -47,82 +47,88 @@ except (ImportError, LookupError) as e:
     try:
         import rarfile
         use_rarfile = True
-    except ImportError as e:
+    except (ImportError, SyntaxError) as e:
         log.debug('Cannot import rarfile, extracting cover files from rar files will not work: %s', e)
         use_rarfile = False
     use_comic_meta = False
 
-def _cover_processing(tmp_file_name, img, extension):
-    if use_PIL:
-        # 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()
+NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
+COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
 
-    prefix = os.path.dirname(tmp_file_name)
-    if img:
-        tmp_cover_name = prefix + '/cover.jpg'
-        image = open(tmp_cover_name, 'wb')
-        image.write(img)
-        image.close()
-    else:
-        tmp_cover_name = None
+def _cover_processing(tmp_file_name, img, extension):
+    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 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
+
+    with open(tmp_cover_name, 'wb') as f:
+        f.write(img)
     return tmp_cover_name
 
 
-
-def _extractCover(tmp_file_name, original_file_extension, rarExceutable):
-    cover_data = extension = None
-    if use_comic_meta:
-        archive = ComicArchive(tmp_file_name)
-        for index, name in enumerate(archive.getPageNameList()):
+def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable):
+    cover_data = None
+    if original_file_extension.upper() == '.CBZ':
+        cf = zipfile.ZipFile(tmp_file_name)
+        for name in cf.namelist():
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
-                if extension in ('.jpg', '.jpeg', '.png', '.webp'):
-                    cover_data = archive.getPage(index)
+                if extension in COVER_EXTENSIONS:
+                    cover_data = cf.read(name)
                     break
-    else:
-        if original_file_extension.upper() == '.CBZ':
-            cf = zipfile.ZipFile(tmp_file_name)
-            for name in cf.namelist():
-                ext = os.path.splitext(name)
-                if len(ext) > 1:
-                    extension = ext[1].lower()
-                    if extension in ('.jpg', '.jpeg', '.png', '.webp'):
-                        cover_data = cf.read(name)
-                        break
-        elif original_file_extension.upper() == '.CBT':
-            cf = tarfile.TarFile(tmp_file_name)
+    elif original_file_extension.upper() == '.CBT':
+        cf = tarfile.TarFile(tmp_file_name)
+        for name in cf.getnames():
+            ext = os.path.splitext(name)
+            if len(ext) > 1:
+                extension = ext[1].lower()
+                if extension in COVER_EXTENSIONS:
+                    cover_data = cf.extractfile(name).read()
+                    break
+    elif original_file_extension.upper() == '.CBR' and use_rarfile:
+        try:
+            rarfile.UNRAR_TOOL = rarExecutable
+            cf = rarfile.RarFile(tmp_file_name)
             for name in cf.getnames():
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
-                    if extension in ('.jpg', '.jpeg', '.png', '.webp'):
-                        cover_data = cf.extractfile(name).read()
+                    if extension in COVER_EXTENSIONS:
+                        cover_data = cf.read(name)
                         break
-        elif original_file_extension.upper() == '.CBR' and use_rarfile:
-            try:
-                rarfile.UNRAR_TOOL = rarExceutable
-                cf = rarfile.RarFile(tmp_file_name)
-                for name in cf.getnames():
-                    ext = os.path.splitext(name)
-                    if len(ext) > 1:
-                        extension = ext[1].lower()
-                        if extension in ('.jpg', '.jpeg', '.png', '.webp'):
-                            cover_data = cf.read(name)
-                            break
-            except Exception as e:
-                log.debug('Rarfile failed with error: %s', e)
+        except Exception as e:
+            log.debug('Rarfile failed with error: %s', e)
+    return cover_data
+
+
+def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
+    cover_data = extension = None
+    if use_comic_meta:
+        archive = ComicArchive(tmp_file_name, rar_exe_path=rarExecutable)
+        for index, name in enumerate(archive.getPageNameList()):
+            ext = os.path.splitext(name)
+            if len(ext) > 1:
+                extension = ext[1].lower()
+                if extension in COVER_EXTENSIONS:
+                    cover_data = archive.getPage(index)
+                    break
+    else:
+        cover_data = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
     return _cover_processing(tmp_file_name, cover_data, extension)
 
 
-def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rarExceutable):
+def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rarExecutable):
     if use_comic_meta:
-        archive = ComicArchive(tmp_file_path, rar_exe_path=rarExceutable)
+        archive = ComicArchive(tmp_file_path, rar_exe_path=rarExecutable)
         if archive.seemsToBeAComicArchive():
             if archive.hasMetadata(MetaDataStyle.CIX):
                 style = MetaDataStyle.CIX
@@ -134,21 +140,16 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
             # if style is not None:
             loadedMetadata = archive.readMetadata(style)
 
-            lang = loadedMetadata.language
-            if lang:
-                if len(lang) == 2:
-                     loadedMetadata.language = isoLanguages.get(part1=lang).name
-                elif len(lang) == 3:
-                     loadedMetadata.language = isoLanguages.get(part3=lang).name
-            else:
-                 loadedMetadata.language = ""
+            lang = loadedMetadata.language or ""
+            loadedMetadata.language = isoLanguages.get_lang3(lang)
 
             return BookMeta(
                 file_path=tmp_file_path,
                 extension=original_file_extension,
                 title=loadedMetadata.title or original_file_name,
-                author=" & ".join([credit["person"] for credit in loadedMetadata.credits if credit["role"] == "Writer"]) or u'Unknown',
-                cover=_extractCover(tmp_file_path, original_file_extension, rarExceutable),
+                author=" & ".join([credit["person"]
+                                   for credit in loadedMetadata.credits if credit["role"] == "Writer"]) or u'Unknown',
+                cover=_extractCover(tmp_file_path, original_file_extension, rarExecutable),
                 description=loadedMetadata.comments or "",
                 tags="",
                 series=loadedMetadata.series or "",
@@ -160,7 +161,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
         extension=original_file_extension,
         title=original_file_name,
         author=u'Unknown',
-        cover=_extractCover(tmp_file_path, original_file_extension, rarExceutable),
+        cover=_extractCover(tmp_file_path, original_file_extension, rarExecutable),
         description="",
         tags="",
         series="",
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 3573abe7..60e17eb3 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -19,10 +19,10 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
-import json
 import sys
 
 from sqlalchemy import exc, Column, String, Integer, SmallInteger, Boolean, BLOB, JSON
+from sqlalchemy.exc import OperationalError
 from sqlalchemy.ext.declarative import declarative_base
 
 from . import constants, cli, logger, ub
@@ -109,9 +109,12 @@ class _Settings(_Base):
     config_ldap_serv_username = Column(String, default='cn=admin,dc=example,dc=org')
     config_ldap_serv_password = Column(String, default="")
     config_ldap_encryption = Column(SmallInteger, default=0)
+    config_ldap_cacert_path = Column(String, default="")
     config_ldap_cert_path = Column(String, default="")
+    config_ldap_key_path = Column(String, default="")
     config_ldap_dn = Column(String, default='dc=example,dc=org')
     config_ldap_user_object = Column(String, default='uid=%s')
+    config_ldap_member_user_object = Column(String, default='') #
     config_ldap_openldap = Column(Boolean, default=True)
     config_ldap_group_object_filter = Column(String, default='(&(objectclass=posixGroup)(cn=%s))')
     config_ldap_group_members_field = Column(String, default='memberUid')
@@ -143,15 +146,16 @@ class _ConfigSQL(object):
         self.load()
 
         change = False
-        if self.config_converterpath == None:
+        if self.config_converterpath == None:  # pylint: disable=access-member-before-definition
             change = True
             self.config_converterpath = autodetect_calibre_binary()
 
-        if self.config_kepubifypath == None:
+        if self.config_kepubifypath == None:  # pylint: disable=access-member-before-definition
+
             change = True
             self.config_kepubifypath = autodetect_kepubify_binary()
 
-        if self.config_rarfile_location == None:
+        if self.config_rarfile_location == None:  # pylint: disable=access-member-before-definition
             change = True
             self.config_rarfile_location = autodetect_unrar_binary()
         if change:
@@ -178,7 +182,8 @@ class _ConfigSQL(object):
             return None
         return self.config_keyfile
 
-    def get_config_ipaddress(self):
+    @staticmethod
+    def get_config_ipaddress():
         return cli.ipadress or ""
 
     def _has_role(self, role_flag):
@@ -269,6 +274,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] != '_' and not k.endswith("password") and not k.endswith("secret"):
+                storage[k] = v
+        return storage
+
+
     def load(self):
         '''Load all configuration values from the underlying storage.'''
         s = self._read_from_storage()  # type: _Settings
@@ -287,13 +300,18 @@ class _ConfigSQL(object):
                 db_file = os.path.join(self.config_calibre_dir, 'metadata.db')
                 have_metadata_db = os.path.isfile(db_file)
         self.db_configured = have_metadata_db
-        constants.EXTENSIONS_UPLOAD = [x.lstrip().rstrip() for x in self.config_upload_formats.split(',')]
+        constants.EXTENSIONS_UPLOAD = [x.lstrip().rstrip().lower() for x in self.config_upload_formats.split(',')]
+        # pylint: disable=access-member-before-definition
         logfile = logger.setup(self.config_logfile, self.config_log_level)
         if logfile != self.config_logfile:
             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.'''
@@ -307,7 +325,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):
@@ -348,7 +370,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/constants.py b/cps/constants.py
index ccb0d8a8..200bec8d 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -21,7 +21,9 @@ import sys
 import os
 from collections import namedtuple
 
+# if installed via pip this variable is set to true
 HOME_CONFIG = False
+UPDATER_AVAILABLE = True
 
 # Base dir is parent of current file, necessary if called from different folder
 if sys.version_info < (3, 0):
@@ -40,7 +42,7 @@ if HOME_CONFIG:
         os.makedirs(home_dir)
     CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', home_dir)
 else:
-    CONFIG_DIR      = os.environ.get('CALIBRE_DBPATH', BASE_DIR)
+    CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', BASE_DIR)
 
 
 ROLE_USER               = 0 << 0
@@ -81,10 +83,11 @@ SIDEBAR_PUBLISHER       = 1 << 12
 SIDEBAR_RATING          = 1 << 13
 SIDEBAR_FORMAT          = 1 << 14
 SIDEBAR_ARCHIVED        = 1 << 15
-# SIDEBAR_LIST            = 1 << 16
+SIDEBAR_DOWNLOAD        = 1 << 16
+SIDEBAR_LIST            = 1 << 17
 
 ADMIN_USER_ROLES        = sum(r for r in ALL_ROLES.values()) & ~ROLE_ANONYMOUS
-ADMIN_USER_SIDEBAR      = (SIDEBAR_ARCHIVED << 1) - 1
+ADMIN_USER_SIDEBAR      = (SIDEBAR_LIST << 1) - 1
 
 UPDATE_STABLE       = 0 << 0
 AUTO_UPDATE_STABLE  = 1 << 0
@@ -101,7 +104,7 @@ LDAP_AUTH_SIMPLE         = 0
 
 DEFAULT_MAIL_SERVER = "mail.example.org"
 
-DEFAULT_PASSWORD    = "admin123"
+DEFAULT_PASSWORD    = "admin123"  # nosec  # noqa
 DEFAULT_PORT        = 8083
 env_CALIBRE_PORT = os.environ.get("CALIBRE_PORT", DEFAULT_PORT)
 try:
@@ -112,7 +115,8 @@ del env_CALIBRE_PORT
 
 
 EXTENSIONS_AUDIO    = {'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'}
-EXTENSIONS_CONVERT  = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt']
+EXTENSIONS_CONVERT_FROM  = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt','cbz','cbr']
+EXTENSIONS_CONVERT_TO  = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt']
 EXTENSIONS_UPLOAD   = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx',
                        'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'}
 
@@ -128,7 +132,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages')
 
-STABLE_VERSION = {'version': '0.6.9 Beta'}
+STABLE_VERSION = {'version': '0.6.12 Beta'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/cps/converter.py b/cps/converter.py
index 01a6fbc7..2ff73666 100644
--- a/cps/converter.py
+++ b/cps/converter.py
@@ -19,7 +19,6 @@
 from __future__ import division, print_function, unicode_literals
 import os
 import re
-import sys
 from flask_babel import gettext as _
 
 from . import config, logger
diff --git a/cps/db.py b/cps/db.py
index fb1d5c57..3eec6454 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -24,18 +24,17 @@ import re
 import ast
 import json
 from datetime import datetime
-import threading
 
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey, CheckConstraint
 from sqlalchemy import String, Integer, Boolean, TIMESTAMP, Float
 from sqlalchemy.orm import relationship, sessionmaker, scoped_session
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.exc import OperationalError
+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 _
@@ -43,12 +42,15 @@ from flask_babel import gettext as _
 from . import logger, ub, isoLanguages
 from .pagination import Pagination
 
+from weakref import WeakSet
+
 try:
     import unidecode
     use_unidecode = True
 except ImportError:
     use_unidecode = False
 
+log = logger.create()
 
 cc_exceptions = ['datetime', 'comments', 'composite', 'series']
 cc_classes = {}
@@ -56,34 +58,34 @@ cc_classes = {}
 Base = declarative_base()
 
 books_authors_link = Table('books_authors_link', Base.metadata,
-    Column('book', Integer, ForeignKey('books.id'), primary_key=True),
-    Column('author', Integer, ForeignKey('authors.id'), primary_key=True)
-    )
+                           Column('book', Integer, ForeignKey('books.id'), primary_key=True),
+                           Column('author', Integer, ForeignKey('authors.id'), primary_key=True)
+                           )
 
 books_tags_link = Table('books_tags_link', Base.metadata,
-    Column('book', Integer, ForeignKey('books.id'), primary_key=True),
-    Column('tag', Integer, ForeignKey('tags.id'), primary_key=True)
-    )
+                        Column('book', Integer, ForeignKey('books.id'), primary_key=True),
+                        Column('tag', Integer, ForeignKey('tags.id'), primary_key=True)
+                        )
 
 books_series_link = Table('books_series_link', Base.metadata,
-    Column('book', Integer, ForeignKey('books.id'), primary_key=True),
-    Column('series', Integer, ForeignKey('series.id'), primary_key=True)
-    )
+                          Column('book', Integer, ForeignKey('books.id'), primary_key=True),
+                          Column('series', Integer, ForeignKey('series.id'), primary_key=True)
+                          )
 
 books_ratings_link = Table('books_ratings_link', Base.metadata,
-    Column('book', Integer, ForeignKey('books.id'), primary_key=True),
-    Column('rating', Integer, ForeignKey('ratings.id'), primary_key=True)
-    )
+                           Column('book', Integer, ForeignKey('books.id'), primary_key=True),
+                           Column('rating', Integer, ForeignKey('ratings.id'), primary_key=True)
+                           )
 
 books_languages_link = Table('books_languages_link', Base.metadata,
-    Column('book', Integer, ForeignKey('books.id'), primary_key=True),
-    Column('lang_code', Integer, ForeignKey('languages.id'), primary_key=True)
-    )
+                             Column('book', Integer, ForeignKey('books.id'), primary_key=True),
+                             Column('lang_code', Integer, ForeignKey('languages.id'), primary_key=True)
+                             )
 
 books_publishers_link = Table('books_publishers_link', Base.metadata,
-    Column('book', Integer, ForeignKey('books.id'), primary_key=True),
-    Column('publisher', Integer, ForeignKey('publishers.id'), primary_key=True)
-    )
+                              Column('book', Integer, ForeignKey('books.id'), primary_key=True),
+                              Column('publisher', Integer, ForeignKey('publishers.id'), primary_key=True)
+                              )
 
 
 class Identifiers(Base):
@@ -117,6 +119,12 @@ class Identifiers(Base):
             return u"Google Books"
         elif format_type == "kobo":
             return u"Kobo"
+        elif format_type == "litres":
+            return u"ЛитРес"
+        elif format_type == "issn":
+            return u"ISSN"
+        elif format_type == "isfdb":
+            return u"ISFDB"
         if format_type == "lubimyczytac":
             return u"Lubimyczytac"
         else:
@@ -125,9 +133,9 @@ class Identifiers(Base):
     def __repr__(self):
         format_type = self.type.lower()
         if format_type == "amazon" or format_type == "asin":
-            return u"https://amzn.com/{0}".format(self.val)
+            return u"https://amazon.com/dp/{0}".format(self.val)
         elif format_type.startswith('amazon_'):
-            return u"https://amazon.{0}/{1}".format(format_type[7:], self.val)
+            return u"https://amazon.{0}/dp/{1}".format(format_type[7:], self.val)
         elif format_type == "isbn":
             return u"https://www.worldcat.org/isbn/{0}".format(self.val)
         elif format_type == "doi":
@@ -141,11 +149,15 @@ class Identifiers(Base):
         elif format_type == "kobo":
             return u"https://www.kobo.com/ebook/{0}".format(self.val)
         elif format_type == "lubimyczytac":
-            return u" https://lubimyczytac.pl/ksiazka/{0}".format(self.val)
-        elif format_type == "url":
-            return u"{0}".format(self.val)
+            return u"https://lubimyczytac.pl/ksiazka/{0}/ksiazka".format(self.val)
+        elif format_type == "litres":
+            return u"https://www.litres.ru/{0}".format(self.val)
+        elif format_type == "issn":
+            return u"https://portal.issn.org/resource/ISSN/{0}".format(self.val)
+        elif format_type == "isfdb":
+            return u"http://www.isfdb.org/cgi-bin/pl.cgi?{0}".format(self.val)
         else:
-            return u""
+            return u"{0}".format(self.val)
 
 
 class Comments(Base):
@@ -159,6 +171,9 @@ class Comments(Base):
         self.text = text
         self.book = book
 
+    def get(self):
+        return self.text
+
     def __repr__(self):
         return u"<Comments({0})>".format(self.text)
 
@@ -172,6 +187,9 @@ class Tags(Base):
     def __init__(self, name):
         self.name = name
 
+    def get(self):
+        return self.name
+
     def __repr__(self):
         return u"<Tags('{0})>".format(self.name)
 
@@ -189,6 +207,9 @@ class Authors(Base):
         self.sort = sort
         self.link = link
 
+    def get(self):
+        return self.name
+
     def __repr__(self):
         return u"<Authors('{0},{1}{2}')>".format(self.name, self.sort, self.link)
 
@@ -204,6 +225,9 @@ class Series(Base):
         self.name = name
         self.sort = sort
 
+    def get(self):
+        return self.name
+
     def __repr__(self):
         return u"<Series('{0},{1}')>".format(self.name, self.sort)
 
@@ -217,6 +241,9 @@ class Ratings(Base):
     def __init__(self, rating):
         self.rating = rating
 
+    def get(self):
+        return self.rating
+
     def __repr__(self):
         return u"<Ratings('{0}')>".format(self.rating)
 
@@ -230,6 +257,12 @@ class Languages(Base):
     def __init__(self, lang_code):
         self.lang_code = lang_code
 
+    def get(self):
+        if self.language_name:
+            return self.language_name
+        else:
+            return self.lang_code
+
     def __repr__(self):
         return u"<Languages('{0}')>".format(self.lang_code)
 
@@ -245,13 +278,16 @@ class Publishers(Base):
         self.name = name
         self.sort = sort
 
+    def get(self):
+        return self.name
+
     def __repr__(self):
         return u"<Publishers('{0},{1}')>".format(self.name, self.sort)
 
 
 class Data(Base):
     __tablename__ = 'data'
-    __table_args__ = {'schema':'calibre'}
+    __table_args__ = {'schema': 'calibre'}
 
     id = Column(Integer, primary_key=True)
     book = Column(Integer, ForeignKey('books.id'), nullable=False)
@@ -265,6 +301,10 @@ class Data(Base):
         self.uncompressed_size = uncompressed_size
         self.name = name
 
+    # ToDo: Check
+    def get(self):
+        return self.name
+
     def __repr__(self):
         return u"<Data('{0},{1}{2}{3}')>".format(self.book, self.format, self.uncompressed_size, self.name)
 
@@ -272,14 +312,14 @@ class Data(Base):
 class Books(Base):
     __tablename__ = 'books'
 
-    DEFAULT_PUBDATE = "0101-01-01 00:00:00+00:00"
+    DEFAULT_PUBDATE = datetime(101, 1, 1, 0, 0, 0, 0)  # ("0101-01-01 00:00:00+00:00")
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     title = Column(String(collation='NOCASE'), nullable=False, default='Unknown')
     sort = Column(String(collation='NOCASE'))
     author_sort = Column(String(collation='NOCASE'))
     timestamp = Column(TIMESTAMP, default=datetime.utcnow)
-    pubdate = Column(String) # , default=datetime.utcnow)
+    pubdate = Column(TIMESTAMP, default=DEFAULT_PUBDATE)
     series_index = Column(String, nullable=False, default="1.0")
     last_modified = Column(TIMESTAMP, default=datetime.utcnow)
     path = Column(String, default="", nullable=False)
@@ -309,7 +349,8 @@ class Books(Base):
         self.series_index = series_index
         self.last_modified = last_modified
         self.path = path
-        self.has_cover = has_cover
+        self.has_cover = (has_cover != None)
+
 
     def __repr__(self):
         return u"<Books('{0},{1}{2}{3}{4}{5}{6}{7}{8}')>".format(self.title, self.sort, self.author_sort,
@@ -320,6 +361,7 @@ class Books(Base):
     def atom_timestamp(self):
         return (self.timestamp.strftime('%Y-%m-%dT%H:%M:%S+00:00') or '')
 
+
 class Custom_Columns(Base):
     __tablename__ = 'custom_columns'
 
@@ -340,46 +382,73 @@ class Custom_Columns(Base):
         return display_dict
 
 
-class CalibreDB(threading.Thread):
+class AlchemyEncoder(json.JSONEncoder):
 
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self.engine = None
-        self.session = None
-        self.queue = None
-        self.log = None
-        self.config = None
-
-    def add_queue(self,queue):
-        self.queue = queue
-        self.log = logger.create()
-
-    def run(self):
-        while True:
-            i = self.queue.get()
-            if i == 'dummy':
-                self.queue.task_done()
-                break
-            if i['task'] == 'add_format':
-                cur_book = self.session.query(Books).filter(Books.id == i['id']).first()
-                cur_book.data.append(i['format'])
+    def default(self, o):
+        if isinstance(o.__class__, DeclarativeMeta):
+            # an SQLAlchemy class
+            fields = {}
+            for field in [x for x in dir(o) if not x.startswith('_') and x != 'metadata']:
+                if field == 'books':
+                    continue
+                data = o.__getattribute__(field)
                 try:
-                    # db.session.merge(cur_book)
-                    self.session.commit()
-                except OperationalError as e:
-                    self.session.rollback()
-                    self.log.error("Database error: %s", e)
-                    # self._handleError(_(u"Database error: %(error)s.", error=e))
-                    # return
-            self.queue.task_done()
+                    if isinstance(data, str):
+                        data = data.replace("'", "\'")
+                    elif isinstance(data, InstrumentedList):
+                        el = list()
+                        for ele in data:
+                            if ele.get:
+                                el.append(ele.get())
+                            else:
+                                el.append(json.dumps(ele, cls=AlchemyEncoder))
+                        if field == 'authors':
+                            data = " & ".join(el)
+                        else:
+                            data = ",".join(el)
+                        if data == '[]':
+                            data = ""
+                    else:
+                        json.dumps(data)
+                    fields[field] = data
+                except Exception:
+                    fields[field] = ""
+            # a json-encodable dict
+            return fields
+
+        return json.JSONEncoder.default(self, o)
 
 
-    def stop(self):
-        self.queue.put('dummy')
+class CalibreDB():
+    _init = False
+    engine = None
+    config = None
+    session_factory = None
+    # This is a WeakSet so that references here don't keep other CalibreDB
+    # instances alive once they reach the end of their respective scopes
+    instances = WeakSet()
 
-    def setup_db(self, config, app_db_path):
-        self.config = config
-        self.dispose()
+    def __init__(self, expire_on_commit=True):
+        """ Initialize a new CalibreDB session
+        """
+        self.session = None
+        if self._init:
+            self.initSession(expire_on_commit)
+
+        self.instances.add(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
+    def setup_db(cls, config, app_db_path):
+        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()
@@ -391,22 +460,21 @@ class CalibreDB(threading.Thread):
             return False
 
         try:
-            self.engine = create_engine('sqlite://',
-                                   echo=False,
-                                   isolation_level="SERIALIZABLE",
-                                   connect_args={'check_same_thread': False},
-                                   poolclass=StaticPool)
-            self.engine.execute("attach database '{}' as calibre;".format(dbpath))
-            self.engine.execute("attach database '{}' as app_settings;".format(app_db_path))
+            cls.engine = create_engine('sqlite://',
+                                       echo=False,
+                                       isolation_level="SERIALIZABLE",
+                                       connect_args={'check_same_thread': False},
+                                       poolclass=StaticPool)
+            cls.engine.execute("attach database '{}' as calibre;".format(dbpath))
+            cls.engine.execute("attach database '{}' as app_settings;".format(app_db_path))
 
-            conn = self.engine.connect()
+            conn = cls.engine.connect()
             # conn.text_factory = lambda b: b.decode(errors = 'ignore') possible fix for #1302
         except Exception as e:
             config.invalidate(e)
             return False
 
         config.db_configured = True
-        self.update_title_sort(config, conn.connection)
 
         if not cc_classes:
             cc = conn.execute("SELECT id, datatype FROM custom_columns")
@@ -421,12 +489,12 @@ class CalibreDB(threading.Thread):
                                      'book': Column(Integer, ForeignKey('books.id'),
                                                     primary_key=True),
                                      'map_value': Column('value', Integer,
-                                                     ForeignKey('custom_column_' +
-                                                                str(row.id) + '.id'),
-                                                     primary_key=True),
+                                                         ForeignKey('custom_column_' +
+                                                                    str(row.id) + '.id'),
+                                                         primary_key=True),
                                      'extra': Column(Float),
-                                     'asoc' : relationship('custom_column_' + str(row.id), uselist=False),
-                                     'value' : association_proxy('asoc', 'value')
+                                     'asoc': relationship('custom_column_' + str(row.id), uselist=False),
+                                     'value': association_proxy('asoc', 'value')
                                      }
                         books_custom_column_links[row.id] = type(str('books_custom_column_' + str(row.id) + '_link'),
                                                                  (Base,), dicttable)
@@ -462,7 +530,7 @@ class CalibreDB(threading.Thread):
                             'custom_column_' + str(cc_id[0]),
                             relationship(cc_classes[cc_id[0]],
                                          primaryjoin=(
-                                         Books.id == cc_classes[cc_id[0]].book),
+                                             Books.id == cc_classes[cc_id[0]].book),
                                          backref='books'))
                 elif (cc_id[1] == 'series'):
                     setattr(Books,
@@ -476,24 +544,27 @@ class CalibreDB(threading.Thread):
                                          secondary=books_custom_column_links[cc_id[0]],
                                          backref='books'))
 
-        Session = scoped_session(sessionmaker(autocommit=False,
-                                              autoflush=False,
-                                              bind=self.engine))
-        self.session = Session()
+        cls.session_factory = scoped_session(sessionmaker(autocommit=False,
+                                                          autoflush=True,
+                                                          bind=cls.engine))
+        for inst in cls.instances:
+            inst.initSession()
+
+        cls._init = True
         return True
 
     def get_book(self, book_id):
         return self.session.query(Books).filter(Books.id == book_id).first()
 
     def get_filtered_book(self, book_id, allow_show_archived=False):
-        return self.session.query(Books).filter(Books.id == book_id).\
+        return self.session.query(Books).filter(Books.id == book_id). \
             filter(self.common_filters(allow_show_archived)).first()
 
     def get_book_by_uuid(self, book_uuid):
         return self.session.query(Books).filter(Books.uuid == book_uuid).first()
 
-    def get_book_format(self, book_id, format):
-        return self.session.query(Data).filter(Data.book == book_id).filter(Data.format == format).first()
+    def get_book_format(self, book_id, file_format):
+        return self.session.query(Data).filter(Data.book == book_id).filter(Data.format == file_format).first()
 
     # Language and content filters for displaying in the UI
     def common_filters(self, allow_show_archived=False):
@@ -533,10 +604,12 @@ class CalibreDB(threading.Thread):
                     pos_content_cc_filter, ~neg_content_cc_filter, archived_filter)
 
     # Fill indexpage with all requested data from database
-    def fill_indexpage(self, page, database, db_filter, order, *join):
-        return self.fill_indexpage_with_archived_books(page, database, db_filter, order, False, *join)
+    def fill_indexpage(self, page, pagesize, database, db_filter, order, *join):
+        return self.fill_indexpage_with_archived_books(page, pagesize, database, db_filter, order, False, *join)
 
-    def fill_indexpage_with_archived_books(self, page, database, db_filter, order, allow_show_archived, *join):
+    def fill_indexpage_with_archived_books(self, page, pagesize, database, db_filter, order, allow_show_archived,
+                                           *join):
+        pagesize = pagesize or self.config.config_books_per_page
         if current_user.show_detail_random():
             randm = self.session.query(Books) \
                 .filter(self.common_filters(allow_show_archived)) \
@@ -544,16 +617,21 @@ class CalibreDB(threading.Thread):
                 .limit(self.config.config_random_books)
         else:
             randm = false()
-        off = int(int(self.config.config_books_per_page) * (page - 1))
+        off = int(int(pagesize) * (page - 1))
         query = self.session.query(database) \
             .join(*join, isouter=True) \
             .filter(db_filter) \
             .filter(self.common_filters(allow_show_archived))
-        pagination = Pagination(page, self.config.config_books_per_page,
-                                len(query.all()))
-        entries = query.order_by(*order).offset(off).limit(self.config.config_books_per_page).all()
-        for book in entries:
-            book = self.order_authors(book)
+        entries = list()
+        pagination = list()
+        try:
+            pagination = Pagination(page, pagesize,
+                                    len(query.all()))
+            entries = query.order_by(*order).offset(off).limit(pagesize).all()
+        except Exception as e:
+            log.debug_or_exception(e)
+        #for book in entries:
+        #    book = self.order_authors(book)
         return entries, randm, pagination
 
     # Orders all Authors in the list according to authors sort
@@ -561,13 +639,16 @@ class CalibreDB(threading.Thread):
         sort_authors = entry.author_sort.split('&')
         authors_ordered = list()
         error = False
+        ids = [a.id for a in entry.authors]
         for auth in sort_authors:
+            results = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).all()
             # ToDo: How to handle not found authorname
-            result = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).first()
-            if not result:
+            if not len(results):
                 error = True
                 break
-            authors_ordered.append(result)
+            for r in results:
+                if r.id in ids:
+                    authors_ordered.append(r)
         if not error:
             entry.authors = authors_ordered
         return entry
@@ -587,24 +668,37 @@ class CalibreDB(threading.Thread):
         for authorterm in authorterms:
             q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
 
-        return self.session.query(Books)\
+        return self.session.query(Books) \
             .filter(and_(Books.authors.any(and_(*q)), func.lower(Books.title).ilike("%" + title + "%"))).first()
 
     # read search results from calibre-database and return it (function is used for feed and simple search
-    def get_search_results(self, term):
+    def get_search_results(self, term, offset=None, order=None, limit=None):
+        order = order or [Books.sort]
+        pagination = None
         term.strip().lower()
         self.session.connection().connection.connection.create_function("lower", 1, lcase)
         q = list()
         authorterms = re.split("[, ]+", term)
         for authorterm in authorterms:
             q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
-        return self.session.query(Books).filter(self.common_filters(True)).filter(
+        result = self.session.query(Books).filter(self.common_filters(True)).filter(
             or_(Books.tags.any(func.lower(Tags.name).ilike("%" + term + "%")),
                 Books.series.any(func.lower(Series.name).ilike("%" + term + "%")),
                 Books.authors.any(and_(*q)),
                 Books.publishers.any(func.lower(Publishers.name).ilike("%" + term + "%")),
                 func.lower(Books.title).ilike("%" + term + "%")
-                )).order_by(Books.sort).all()
+                )).order_by(*order).all()
+        result_count = len(result)
+        if offset != None and limit != None:
+            offset = int(offset)
+            limit_all = offset + int(limit)
+            pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
+        else:
+            offset = 0
+            limit_all = result_count
+
+        ub.store_ids(result)
+        return result[offset:limit_all], result_count, pagination
 
     # Creates for all stored languages a translated speaking name in the array for the UI
     def speaking_language(self, languages=None):
@@ -638,17 +732,23 @@ class CalibreDB(threading.Thread):
         conn = conn or self.session.connection().connection.connection
         conn.create_function("title_sort", 1, _title_sort)
 
-    def dispose(self):
+    @classmethod
+    def dispose(cls):
         # global session
 
-        old_session = self.session
-        self.session = None
-        if old_session:
-            try: old_session.close()
-            except: pass
-            if old_session.bind:
-                try: old_session.bind.dispose()
-                except Exception: pass
+        for inst in cls.instances:
+            old_session = inst.session
+            inst.session = None
+            if old_session:
+                try:
+                    old_session.close()
+                except Exception:
+                    pass
+                if old_session.bind:
+                    try:
+                        old_session.bind.dispose()
+                    except Exception:
+                        pass
 
         for attr in list(Books.__dict__.keys()):
             if attr.startswith("custom_column_"):
@@ -665,14 +765,15 @@ class CalibreDB(threading.Thread):
                     Base.metadata.remove(table)
 
     def reconnect_db(self, config, app_db_path):
-        self.session.close()
+        self.dispose()
         self.engine.dispose()
         self.setup_db(config, app_db_path)
 
+
 def lcase(s):
     try:
         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
new file mode 100644
index 00000000..8f0cdeee
--- /dev/null
+++ b/cps/debug_info.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2012-2019 cervinko, idalin, SiphonSquirrel, ouzklcn, akushsky,
+#                            OzzieIsaacs, bodybybuddha, jkrehm, matthazinski, janeczku
+#
+#  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 shutil
+import glob
+import zipfile
+import json
+from io import BytesIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
+import os
+
+from flask import send_file
+
+from . import logger, config
+from .about import collect_stats
+
+log = logger.create()
+
+def assemble_logfiles(file_name):
+    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))
+
+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) + '*'))
+    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))
+    memory_zip.seek(0)
+    return send_file(memory_zip,
+                     as_attachment=True,
+                     attachment_filename="Calibre-Web-debug-pack.zip")
diff --git a/cps/editbooks.py b/cps/editbooks.py
index cf1eb4c3..1b1e13a2 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -30,18 +30,45 @@ from uuid import uuid4
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
-from sqlalchemy.exc import OperationalError
-
+from sqlalchemy.exc import OperationalError, IntegrityError
+from sqlite3 import OperationalError as sqliteOperationalError
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper
-from . import config, get_locale, ub, worker, db
+from . import config, get_locale, ub, db
 from . import calibre_db
-from .web import login_required_if_no_ano, render_title_template, edit_required, upload_required
+from .services.worker import WorkerThread
+from .tasks.upload import TaskUpload
+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):
@@ -172,27 +199,48 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
             changed = True
     return changed, error
 
-
-@editbook.route("/delete/<int:book_id>/", defaults={'book_format': ""})
-@editbook.route("/delete/<int:book_id>/<string:book_format>/")
+@editbook.route("/ajax/delete/<int:book_id>")
 @login_required
-def delete_book(book_id, book_format):
+def delete_book_from_details(book_id):
+    return Response(delete_book(book_id,"", True), mimetype='application/json')
+
+
+@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""})
+@editbook.route("/delete/<int:book_id>/<string:book_format>")
+@login_required
+def delete_book_ajax(book_id, book_format):
+    return delete_book(book_id,book_format, False)
+
+def delete_book(book_id, book_format, jsonResponse):
+    warning = {}
     if current_user.role_delete_books():
         book = calibre_db.get_book(book_id)
         if book:
             try:
                 result, error = helper.delete_book(book, config.config_calibre_dir, book_format=book_format.upper())
                 if not result:
-                    flash(error, category="error")
-                    return redirect(url_for('editbook.edit_book', book_id=book_id))
+                    if jsonResponse:
+                        return json.dumps({"location": url_for("editbook.edit_book"),
+                                           "type": "alert",
+                                           "format": "",
+                                           "error": error}),
+                    else:
+                        flash(error, category="error")
+                        return redirect(url_for('editbook.edit_book', book_id=book_id))
                 if error:
-                    flash(error, category="warning")
+                    if jsonResponse:
+                        warning = {"location": url_for("editbook.edit_book"),
+                                                "type": "warning",
+                                                "format": "",
+                                                "error": error}
+                    else:
+                        flash(error, category="warning")
                 if not book_format:
                     # delete book from Shelfs, Downloads, Read list
                     ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).delete()
                     ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id).delete()
                     ub.delete_download(book_id)
-                    ub.session.commit()
+                    ub.session_commit()
 
                     # check if only this book links to:
                     # author, language, series, tags, custom columns
@@ -236,23 +284,34 @@ def delete_book(book_id, book_format):
                         filter(db.Data.format == book_format).delete()
                 calibre_db.session.commit()
             except Exception as e:
-                log.debug(e)
+                log.debug_or_exception(e)
                 calibre_db.session.rollback()
         else:
             # book not found
             log.error('Book with id "%s" could not be deleted: not found', book_id)
     if book_format:
-        flash(_('Book Format Successfully Deleted'), category="success")
-        return redirect(url_for('editbook.edit_book', book_id=book_id))
+        if jsonResponse:
+            return json.dumps([warning, {"location": url_for("editbook.edit_book", book_id=book_id),
+                                         "type": "success",
+                                         "format": book_format,
+                                         "message": _('Book Format Successfully Deleted')}])
+        else:
+            flash(_('Book Format Successfully Deleted'), category="success")
+            return redirect(url_for('editbook.edit_book', book_id=book_id))
     else:
-        flash(_('Book Successfully Deleted'), category="success")
-        return redirect(url_for('web.index'))
+        if jsonResponse:
+            return json.dumps([warning, {"location": url_for('web.index'),
+                                         "type": "success",
+                                         "format": book_format,
+                                         "message": _('Book Successfully Deleted')}])
+        else:
+            flash(_('Book Successfully Deleted'), category="success")
+            return redirect(url_for('web.index'))
 
 
 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"))
@@ -272,7 +331,7 @@ def render_edit_book(book_id):
     kepub_possible=None
     if config.config_converterpath:
         for file in book.data:
-            if file.format.lower() in constants.EXTENSIONS_CONVERT:
+            if file.format.lower() in constants.EXTENSIONS_CONVERT_FROM:
                 valid_source_formats.append(file.format.lower())
     if config.config_kepubifypath and 'epub' in [file.format.lower() for file in book.data]:
         kepub_possible = True
@@ -281,7 +340,7 @@ def render_edit_book(book_id):
 
     # Determine what formats don't already exist
     if config.config_converterpath:
-        allowed_conversion_formats = constants.EXTENSIONS_CONVERT[:]
+        allowed_conversion_formats = constants.EXTENSIONS_CONVERT_TO[:]
         for file in book.data:
             if file.format.lower() in allowed_conversion_formats:
                 allowed_conversion_formats.remove(file.format.lower())
@@ -357,7 +416,10 @@ def edit_book_comments(comments, book):
 def edit_book_languages(languages, book, upload=False):
     input_languages = languages.split(',')
     unknown_languages = []
-    input_l = isoLanguages.get_language_codes(get_locale(), input_languages, unknown_languages)
+    if not upload:
+        input_l = isoLanguages.get_language_codes(get_locale(), input_languages, unknown_languages)
+    else:
+        input_l = isoLanguages.get_valid_language_codes(get_locale(), input_languages, unknown_languages)
     for l in unknown_languages:
         log.error('%s is not a valid language', l)
         flash(_(u"%(langname)s is not a valid language", langname=l), category="warning")
@@ -367,7 +429,7 @@ def edit_book_languages(languages, book, upload=False):
         # the book it's language is set to the filter language
         if input_l[0] != current_user.filter_language() and current_user.filter_language() != "all":
             input_l[0] = calibre_db.session.query(db.Languages). \
-                filter(db.Languages.lang_code == current_user.filter_language()).first()
+                filter(db.Languages.lang_code == current_user.filter_language()).first().lang_code
     # Remove duplicates
     input_l = helper.uniq(input_l)
     return modify_database_object(input_l, book.languages, db.Languages, calibre_db.session, 'languages')
@@ -466,9 +528,11 @@ def upload_single_file(request, book, book_id):
         requested_file = request.files['btn-upload-format']
         # check for empty request
         if requested_file.filename != '':
+            if not current_user.role_upload():
+                abort(403)
             if '.' in requested_file.filename:
                 file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
-                if file_ext not in constants.EXTENSIONS_UPLOAD:
+                if file_ext not in constants.EXTENSIONS_UPLOAD and '' not in constants.EXTENSIONS_UPLOAD:
                     flash(_("File extension '%(ext)s' is not allowed to be uploaded to this server", ext=file_ext),
                           category="error")
                     return redirect(url_for('web.show_book', book_id=book.id))
@@ -505,7 +569,7 @@ def upload_single_file(request, book, book_id):
                     calibre_db.session.add(db_format)
                     calibre_db.session.commit()
                     calibre_db.update_title_sort(config)
-                except OperationalError as e:
+                except (OperationalError, IntegrityError) as e:
                     calibre_db.session.rollback()
                     log.error('Database error: %s', e)
                     flash(_(u"Database error: %(error)s.", error=e), category="error")
@@ -513,8 +577,8 @@ def upload_single_file(request, book, book_id):
 
             # Queue uploader info
             uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=book.title)
-            worker.add_upload(current_user.nickname,
-                "<a href=\"" + url_for('web.show_book', book_id=book.id) + "\">" + uploadText + "</a>")
+            WorkerThread.add(current_user.nickname, TaskUpload(
+                "<a href=\"" + url_for('web.show_book', book_id=book.id) + "\">" + uploadText + "</a>"))
 
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
@@ -526,6 +590,8 @@ def upload_cover(request, book):
         requested_file = request.files['btn-upload-cover']
         # check for empty request
         if requested_file.filename != '':
+            if not current_user.role_upload():
+                abort(403)
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
                 return True
@@ -540,13 +606,20 @@ def upload_cover(request, book):
 @edit_required
 def edit_book(book_id):
     modif_date = False
+
+    # create the function for sorting...
+    try:
+        calibre_db.update_title_sort(config)
+    except sqliteOperationalError as e:
+        log.debug_or_exception(e)
+        calibre_db.session.rollback()
+
     # Show form
     if request.method != 'POST':
         return render_edit_book(book_id)
 
-    # create the function for sorting...
-    calibre_db.update_title_sort(config)
-    book = calibre_db.get_filtered_book(book_id)
+
+    book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
 
     # Book not found
     if not book:
@@ -562,6 +635,7 @@ def edit_book(book_id):
         merge_metadata(to_save, meta)
         # Update book
         edited_books_id = None
+
         #handle book title
         if book.title != to_save["book_title"].rstrip().strip():
             if to_save["book_title"] == '':
@@ -605,13 +679,19 @@ def edit_book(book_id):
             error = helper.update_dir_stucture(edited_books_id, config.config_calibre_dir, input_authors[0])
 
         if not error:
-            if to_save["cover_url"]:
-                result, error = helper.save_cover_from_url(to_save["cover_url"], book.path)
-                if result is True:
-                    book.has_cover = 1
-                    modif_date = True
-                else:
-                    flash(error, category="error")
+            if "cover_url" in to_save:
+                if to_save["cover_url"]:
+                    if not current_user.role_upload():
+                        return "", (403)
+                    if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
+                        book.has_cover = 0
+                    else:
+                        result, error = helper.save_cover_from_url(to_save["cover_url"], book.path)
+                        if result is True:
+                            book.has_cover = 1
+                            modif_date = True
+                        else:
+                            flash(error, category="error")
 
             # Add default series_index to book
             modif_date |= edit_book_series_index(to_save["series_index"], book)
@@ -653,6 +733,7 @@ def edit_book(book_id):
 
             if modif_date:
                 book.last_modified = datetime.utcnow()
+            calibre_db.session.merge(book)
             calibre_db.session.commit()
             if config.config_use_google_drive:
                 gdriveutils.updateGdriveCalibreFromLocal()
@@ -666,7 +747,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))
@@ -716,7 +797,7 @@ def upload():
                 # check if file extension is correct
                 if '.' in requested_file.filename:
                     file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
-                    if file_ext not in constants.EXTENSIONS_UPLOAD:
+                    if file_ext not in constants.EXTENSIONS_UPLOAD and '' not in constants.EXTENSIONS_UPLOAD:
                         flash(
                             _("File extension '%(ext)s' is not allowed to be uploaded to this server",
                               ext=file_ext), category="error")
@@ -768,42 +849,17 @@ def upload():
                         if not db_author:
                             db_author = stored_author
                         sort_author = stored_author.sort
-                    sort_authors_list.append(sort_author) # helper.get_sorted_author(sort_author))
+                    sort_authors_list.append(sort_author)
                 sort_authors = ' & '.join(sort_authors_list)
 
                 title_dir = helper.get_valid_filename(title)
                 author_dir = helper.get_valid_filename(db_author.name)
-                filepath = os.path.join(config.config_calibre_dir, author_dir, title_dir)
-                saved_filename = os.path.join(filepath, title_dir + meta.extension.lower())
-
-                # check if file path exists, otherwise create it, copy file to calibre path and delete temp file
-                if not os.path.exists(filepath):
-                    try:
-                        os.makedirs(filepath)
-                    except OSError:
-                        log.error("Failed to create path %s (Permission denied)", filepath)
-                        flash(_(u"Failed to create path %(path)s (Permission denied).", path=filepath), category="error")
-                        return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-                try:
-                    copyfile(meta.file_path, saved_filename)
-                    os.unlink(meta.file_path)
-                except OSError as e:
-                    log.error("Failed to move file %s: %s", saved_filename, e)
-                    flash(_(u"Failed to Move File %(file)s: %(error)s", file=saved_filename, error=e), category="error")
-                    return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-
-                if meta.cover is None:
-                    has_cover = 0
-                    copyfile(os.path.join(constants.STATIC_DIR, 'generic_cover.jpg'),
-                             os.path.join(filepath, "cover.jpg"))
-                else:
-                    has_cover = 1
 
                 # combine path and normalize path from windows systems
                 path = os.path.join(author_dir, title_dir).replace('\\', '/')
                 # Calibre adds books with utc as timezone
                 db_book = db.Books(title, "", sort_authors, datetime.utcnow(), datetime(101, 1, 1),
-                                   '1', datetime.utcnow(), path, has_cover, db_author, [], "")
+                                   '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
 
                 modif_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
                                                      'author')
@@ -821,7 +877,7 @@ def upload():
                 modif_date |= edit_book_series(meta.series, db_book)
 
                 # Add file to book
-                file_size = os.path.getsize(saved_filename)
+                file_size = os.path.getsize(meta.file_path)
                 db_data = db.Data(db_book, meta.extension.upper()[1:], file_size, title_dir)
                 db_book.data.append(db_data)
                 calibre_db.session.add(db_book)
@@ -829,39 +885,44 @@ def upload():
                 # flush content, get db_book.id available
                 calibre_db.session.flush()
 
-                # Comments needs book id therfore only possiblw after flush
+                # Comments needs book id therfore only possible after flush
                 modif_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
 
                 book_id = db_book.id
                 title = db_book.title
 
-                error = helper.update_dir_stucture(book_id, config.config_calibre_dir, input_authors[0])
+                error = helper.update_dir_structure_file(book_id,
+                                                   config.config_calibre_dir,
+                                                   input_authors[0],
+                                                   meta.file_path,
+                                                   title_dir + meta.extension)
 
                 # move cover to final directory, including book id
-                if has_cover:
-                    new_coverpath = os.path.join(config.config_calibre_dir, db_book.path, "cover.jpg")
-                    try:
-                        copyfile(meta.cover, new_coverpath)
+                if meta.cover:
+                    coverfile = meta.cover
+                else:
+                    coverfile = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+                new_coverpath = os.path.join(config.config_calibre_dir, db_book.path, "cover.jpg")
+                try:
+                    copyfile(coverfile, new_coverpath)
+                    if meta.cover:
                         os.unlink(meta.cover)
-                    except OSError as e:
-                        log.error("Failed to move cover file %s: %s", new_coverpath, e)
-                        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_coverpath,
-                                error=e),
-                              category="error")
+                except OSError as e:
+                    log.error("Failed to move cover file %s: %s", new_coverpath, e)
+                    flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_coverpath,
+                            error=e),
+                          category="error")
 
                 # save data to database, reread data
                 calibre_db.session.commit()
-                #calibre_db.setup_db(config, ub.app_DB_path)
-                # Reread book. It's important not to filter the result, as it could have language which hide it from
-                # current users view (tags are not stored/extracted from metadata and could also be limited)
-                #book = calibre_db.get_book(book_id)
+
                 if config.config_use_google_drive:
                     gdriveutils.updateGdriveCalibreFromLocal()
                 if error:
                     flash(error, category="error")
                 uploadText=_(u"File %(file)s uploaded", file=title)
-                worker.add_upload(current_user.nickname,
-                    "<a href=\"" + url_for('web.show_book', book_id=book_id) + "\">" + uploadText + "</a>")
+                WorkerThread.add(current_user.nickname, TaskUpload(
+                    "<a href=\"" + url_for('web.show_book', book_id=book_id) + "\">" + uploadText + "</a>"))
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
@@ -870,7 +931,7 @@ def upload():
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
                         return Response(json.dumps(resp), mimetype='application/json')
-            except OperationalError as e:
+            except (OperationalError, IntegrityError) as e:
                 calibre_db.session.rollback()
                 log.error("Database error: %s", e)
                 flash(_(u"Database error: %(error)s.", error=e), category="error")
@@ -899,3 +960,113 @@ def convert_bookformat(book_id):
     else:
         flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
     return redirect(url_for('editbook.edit_book', book_id=book_id))
+
+@editbook.route("/ajax/editbooks/<param>", methods=['POST'])
+@login_required_if_no_ano
+@edit_required
+def edit_list_book(param):
+    vals = request.form.to_dict()
+    book = calibre_db.get_book(vals['pk'])
+    if param =='series_index':
+        edit_book_series_index(vals['value'], book)
+    elif param =='tags':
+        edit_book_tags(vals['value'], book)
+    elif param =='series':
+        edit_book_series(vals['value'], book)
+    elif param =='publishers':
+        vals['publisher'] = vals['value']
+        edit_book_publisher(vals, book)
+    elif param =='languages':
+        edit_book_languages(vals['value'], book)
+    elif param =='author_sort':
+        book.author_sort = vals['value']
+    elif param =='title':
+        book.title = vals['value']
+        helper.update_dir_stucture(book.id, config.config_calibre_dir)
+    elif param =='sort':
+        book.sort = vals['value']
+    # ToDo: edit books
+    elif param =='authors':
+        input_authors = vals['value'].split('&')
+        input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
+        modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
+        sort_authors_list = list()
+        for inp in input_authors:
+            stored_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == inp).first()
+            if not stored_author:
+                stored_author = helper.get_sorted_author(inp)
+            else:
+                stored_author = stored_author.sort
+            sort_authors_list.append(helper.get_sorted_author(stored_author))
+        sort_authors = ' & '.join(sort_authors_list)
+        if book.author_sort != sort_authors:
+            book.author_sort = sort_authors
+        helper.update_dir_stucture(book.id, config.config_calibre_dir, input_authors[0])
+    book.last_modified = datetime.utcnow()
+    calibre_db.session.commit()
+    return ""
+
+@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
+@login_required
+def get_sorted_entry(field, bookid):
+    if field == 'title' or field == 'authors':
+        book = calibre_db.get_filtered_book(bookid)
+        if book:
+            if field == 'title':
+                return json.dumps({'sort': book.sort})
+            elif field == 'authors':
+                return json.dumps({'author_sort': book.author_sort})
+    return ""
+
+
+@editbook.route("/ajax/simulatemerge", methods=['POST'])
+@login_required
+@edit_required
+def simulate_merge_list_book():
+    vals = request.get_json().get('Merge_books')
+    if vals:
+        to_book = calibre_db.get_book(vals[0]).title
+        vals.pop(0)
+        if to_book:
+            for book_id in vals:
+                from_book = []
+                from_book.append(calibre_db.get_book(book_id).title)
+            return json.dumps({'to': to_book, 'from': from_book})
+    return ""
+
+
+@editbook.route("/ajax/mergebooks", methods=['POST'])
+@login_required
+@edit_required
+def merge_list_book():
+    vals = request.get_json().get('Merge_books')
+    to_file = list()
+    if vals:
+        # load all formats from target book
+        to_book = calibre_db.get_book(vals[0])
+        vals.pop(0)
+        if to_book:
+            for file in to_book.data:
+                to_file.append(file.format)
+            to_name = helper.get_valid_filename(to_book.title) + ' - ' + \
+                      helper.get_valid_filename(to_book.authors[0].name)
+            for book_id in vals:
+                from_book = calibre_db.get_book(book_id)
+                if from_book:
+                    for element in from_book.data:
+                        if element.format not in to_file:
+                            # create new data entry with: book_id, book_format, uncompressed_size, name
+                            filepath_new = os.path.normpath(os.path.join(config.config_calibre_dir,
+                                                                         to_book.path,
+                                                                         to_name + "." + element.format.lower()))
+                            filepath_old = os.path.normpath(os.path.join(config.config_calibre_dir,
+                                                                         from_book.path,
+                                                                         element.name + "." + element.format.lower()))
+                            copyfile(filepath_old, filepath_new)
+                            to_book.data.append(db.Data(to_book.id,
+                                                        element.format,
+                                                        element.uncompressed_size,
+                                                        to_name))
+                    delete_book(from_book.id,"", True) # json_resp =
+                    return json.dumps({'success': True})
+    return ""
diff --git a/cps/epub.py b/cps/epub.py
index bdba0607..583e4eda 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -26,6 +26,7 @@ from .helper import split_authors
 from .constants import BookMeta
 
 
+
 def extractCover(zipFile, coverFile, coverpath, tmp_file_name):
     if coverFile is None:
         return None
@@ -65,11 +66,11 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         tmp = p.xpath('dc:%s/text()' % s, namespaces=ns)
         if len(tmp) > 0:
             if s == 'creator':
-                epub_metadata[s] = ' & '.join(split_authors(p.xpath('dc:%s/text()' % s, namespaces=ns)))
+                epub_metadata[s] = ' & '.join(split_authors(tmp))
             elif s == 'subject':
-                epub_metadata[s] = ', '.join(p.xpath('dc:%s/text()' % s, namespaces=ns))
+                epub_metadata[s] = ', '.join(tmp)
             else:
-                epub_metadata[s] = p.xpath('dc:%s/text()' % s, namespaces=ns)[0]
+                epub_metadata[s] = tmp[0]
         else:
             epub_metadata[s] = u'Unknown'
 
@@ -83,16 +84,8 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         else:
             epub_metadata['description'] = ""
 
-    if epub_metadata['language'] == u'Unknown':
-        epub_metadata['language'] = ""
-    else:
-        lang = epub_metadata['language'].split('-', 1)[0].lower()
-        if len(lang) == 2:
-            epub_metadata['language'] = isoLanguages.get(part1=lang).name
-        elif len(lang) == 3:
-            epub_metadata['language'] = isoLanguages.get(part3=lang).name
-        else:
-            epub_metadata['language'] = ""
+    lang = epub_metadata['language'].split('-', 1)[0].lower()
+    epub_metadata['language'] = isoLanguages.get_lang3(lang)
 
     series = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='calibre:series']/@content", namespaces=ns)
     if len(series) > 0:
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 82a19890..950f3ce2 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -35,22 +35,22 @@ 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:
     from googleapiclient.errors import HttpError
 except ImportError as err:
-    log.debug(("Cannot import googleapiclient, using gdrive will not work: %s", err))
+    log.debug("Cannot import googleapiclient, using GDrive will not work: %s", err)
 
 current_milli_time = lambda: int(round(time() * 1000))
 
-gdrive_watch_callback_token = 'target=calibreweb-watch_files'
+gdrive_watch_callback_token = 'target=calibreweb-watch_files'  #nosec
 
 
-@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,40 +118,43 @@ 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 ''
+
     log.debug('%r', request.headers)
-    if request.headers.get('X-Goog-Channel-Token') == gdrive_watch_callback_token \
-            and request.headers.get('X-Goog-Resource-State') == 'change' \
-            and request.data:
+    log.debug('%r', request.data)
+    log.info('Change received from gdrive')
 
-        data = request.data
+    try:
+        j = json.loads(request.data)
+        log.info('Getting change details')
+        response = gdriveutils.getChangeById(gdriveutils.Gdrive.Instance().drive, j['id'])
+        log.debug('%r', response)
+        if response:
+            if sys.version_info < (3, 0):
+                dbpath = os.path.join(config.config_calibre_dir, "metadata.db")
+            else:
+                dbpath = os.path.join(config.config_calibre_dir, "metadata.db").encode()
+            if not response['deleted'] and response['file']['title'] == 'metadata.db' \
+                and response['file']['md5Checksum'] != hashlib.md5(dbpath):
+                tmp_dir = os.path.join(tempfile.gettempdir(), 'calibre_web')
+                if not os.path.isdir(tmp_dir):
+                    os.mkdir(tmp_dir)
 
-        def updateMetaData():
-            log.info('Change received from gdrive')
-            log.debug('%r', data)
-            try:
-                j = json.loads(data)
-                log.info('Getting change details')
-                response = gdriveutils.getChangeById(gdriveutils.Gdrive.Instance().drive, j['id'])
-                log.debug('%r', response)
-                if response:
-                    if sys.version_info < (3, 0):
-                        dbpath = os.path.join(config.config_calibre_dir, "metadata.db")
-                    else:
-                        dbpath = os.path.join(config.config_calibre_dir, "metadata.db").encode()
-                    if not response['deleted'] and response['file']['title'] == 'metadata.db' \
-                       and response['file']['md5Checksum'] != hashlib.md5(dbpath):
-                        tmpDir = tempfile.gettempdir()
-                        log.info('Database file updated')
-                        copyfile(dbpath, os.path.join(tmpDir, "metadata.db_" + str(current_milli_time())))
-                        log.info('Backing up existing and downloading updated metadata.db')
-                        gdriveutils.downloadFile(None, "metadata.db", os.path.join(tmpDir, "tmp_metadata.db"))
-                        log.info('Setting up new DB')
-                        # prevent error on windows, as os.rename does on exisiting files
-                        move(os.path.join(tmpDir, "tmp_metadata.db"), dbpath)
-                        calibre_db.reconnect_db(config, ub.app_DB_path)
-            except Exception as e:
-                log.exception(e)
-        updateMetaData()
+                log.info('Database file updated')
+                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(tmp_dir, "tmp_metadata.db"))
+                log.info('Setting up new DB')
+                # 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.debug_or_exception(e)
     return ''
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index a996f879..79587b79 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -20,6 +20,8 @@ from __future__ import division, print_function, unicode_literals
 import os
 import json
 import shutil
+import chardet
+import ssl
 
 from flask import Response, stream_with_context
 from sqlalchemy import create_engine
@@ -30,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
@@ -89,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
 
@@ -188,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()
@@ -206,14 +217,14 @@ 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
 
 
 def getEbooksFolder(drive):
-    return getFolderInFolder('root',config.config_google_drive_folder,drive)
+    return getFolderInFolder('root', config.config_google_drive_folder, drive)
 
 
 def getFolderInFolder(parentId, folderName, drive):
@@ -243,7 +254,7 @@ def getEbooksFolderId(drive=None):
         gDriveId.path = '/'
         session.merge(gDriveId)
         session.commit()
-        return
+        return gDriveId.gdrive_id
 
 
 def getFile(pathId, fileName, drive):
@@ -383,7 +394,8 @@ def uploadFileToEbooksFolder(destFile, f):
             if len(existingFiles) > 0:
                 driveFile = existingFiles[0]
             else:
-                driveFile = drive.CreateFile({'title': x, 'parents': [{"kind": "drive#fileLink", 'id': parent['id']}],})
+                driveFile = drive.CreateFile({'title': x,
+                                              'parents': [{"kind": "drive#fileLink", 'id': parent['id']}], })
             driveFile.SetContentFile(f)
             driveFile.Upload()
         else:
@@ -545,21 +557,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 d40128d7..88c0550b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -32,13 +32,12 @@ from tempfile import gettempdir
 import requests
 from babel.dates import format_datetime
 from babel.units import format_unit
-from flask import send_from_directory, make_response, redirect, abort
+from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_login import current_user
-from sqlalchemy.sql.expression import true, false, and_, text, func
+from sqlalchemy.sql.expression import true, false, and_, text
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
-from . import calibre_db
 
 try:
     from urllib.parse import quote
@@ -51,141 +50,155 @@ 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 logger, config, get_locale, db, ub, worker
+from . import calibre_db
+from .tasks.convert import TaskConvert
+from . import logger, config, get_locale, db, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
-from .worker import STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
-from .worker import TASK_EMAIL, TASK_CONVERT, TASK_UPLOAD, TASK_CONVERT_ANY
-
+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
+    MissingDelegateError = BaseException
+
 
 # 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):
     book = calibre_db.get_book(book_id)
     data = calibre_db.get_book_format(book.id, old_book_format)
+    file_path = os.path.join(calibrepath, book.path, data.name)
     if not data:
         error_message = _(u"%(format)s format not found for book id: %(book)d", format=old_book_format, book=book_id)
         log.error("convert_book_format: %s", error_message)
         return error_message
     if config.config_use_google_drive:
-        df = gd.getFileFromEbooksFolder(book.path, data.name + "." + old_book_format.lower())
-        if df:
-            datafile = os.path.join(calibrepath, book.path, data.name + u"." + old_book_format.lower())
-            if not os.path.exists(os.path.join(calibrepath, book.path)):
-                os.makedirs(os.path.join(calibrepath, book.path))
-            df.GetContentFile(datafile)
-        else:
+        if not gd.getFileFromEbooksFolder(book.path, data.name + "." + old_book_format.lower()):
             error_message = _(u"%(format)s not found on Google Drive: %(fn)s",
                               format=old_book_format, fn=data.name + "." + old_book_format.lower())
             return error_message
-    file_path = os.path.join(calibrepath, book.path, data.name)
-    if os.path.exists(file_path + "." + old_book_format.lower()):
-        # read settings and append converter task to queue
-        if kindle_mail:
-            settings = config.get_mail_settings()
-            settings['subject'] = _('Send to Kindle')  # pretranslate Subject for e-mail
-            settings['body'] = _(u'This e-mail has been sent via Calibre-Web.')
-            # text = _(u"%(format)s: %(book)s", format=new_book_format, book=book.title)
-        else:
-            settings = dict()
-        txt = (u"%s -> %s: %s" % (old_book_format, new_book_format, book.title))
-        settings['old_book_format'] = old_book_format
-        settings['new_book_format'] = new_book_format
-        worker.add_convert(file_path, book.id, user_id, txt, settings, kindle_mail)
-        return None
     else:
-        error_message = _(u"%(format)s not found: %(fn)s",
-                          format=old_book_format, fn=data.name + "." + old_book_format.lower())
-        return error_message
+        if not os.path.exists(file_path + "." + old_book_format.lower()):
+            error_message = _(u"%(format)s not found: %(fn)s",
+                              format=old_book_format, fn=data.name + "." + old_book_format.lower())
+            return error_message
+    # read settings and append converter task to queue
+    if kindle_mail:
+        settings = config.get_mail_settings()
+        settings['subject'] = _('Send to Kindle')  # pretranslate Subject for e-mail
+        settings['body'] = _(u'This e-mail has been sent via Calibre-Web.')
+    else:
+        settings = dict()
+    txt = (u"%s -> %s: %s" % (
+           old_book_format,
+           new_book_format,
+           "<a href=\"" + url_for('web.show_book', book_id=book.id) + "\">" + book.title + "</a>"))
+    settings['old_book_format'] = old_book_format
+    settings['new_book_format'] = new_book_format
+    WorkerThread.add(user_id, TaskConvert(file_path, book.id, txt, settings, kindle_mail, user_id))
+    return None
 
 
 def send_test_mail(kindle_mail, user_name):
-    worker.add_email(_(u'Calibre-Web test e-mail'), None, None,
-                     config.get_mail_settings(), kindle_mail, user_name,
-                     _(u"Test e-mail"), _(u'This e-mail has been sent via Calibre-Web.'))
+    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.')))
     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"
-    worker.add_email(_(u'Get Started with Calibre-Web'), None, None,
-                     config.get_mail_settings(), e_mail, None,
-                     _(u"Registration e-mail for user: %(name)s", name=user_name), text)
+        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,
+        attachment=None,
+        settings=config.get_mail_settings(),
+        recipient=e_mail,
+        taskMessage=_(u"Registration e-mail for user: %(name)s", name=user_name),
+        text=txt
+    ))
     return
 
 
+def check_send_to_kindle_without_converter(entry):
+    bookformats = list()
+    # no converter - only for mobi and pdf formats
+    for ele in iter(entry.data):
+        if ele.uncompressed_size < config.mail_size:
+            if 'MOBI' in ele.format:
+                bookformats.append({'format': 'Mobi',
+                                    'convert': 0,
+                                    'text': _('Send %(format)s to Kindle', format='Mobi')})
+            if 'PDF' in ele.format:
+                bookformats.append({'format': 'Pdf',
+                                    'convert': 0,
+                                    'text': _('Send %(format)s to Kindle', format='Pdf')})
+            if 'AZW' in ele.format:
+                bookformats.append({'format': 'Azw',
+                                    'convert': 0,
+                                    'text': _('Send %(format)s to Kindle', format='Azw')})
+    return bookformats
+
+def check_send_to_kindle_with_converter(entry):
+    bookformats = list()
+    formats = list()
+    for ele in iter(entry.data):
+        if ele.uncompressed_size < config.mail_size:
+            formats.append(ele.format)
+    if 'MOBI' in formats:
+        bookformats.append({'format': 'Mobi',
+                            'convert': 0,
+                            'text': _('Send %(format)s to Kindle', format='Mobi')})
+    if 'AZW' in formats:
+        bookformats.append({'format': 'Azw',
+                            'convert': 0,
+                            'text': _('Send %(format)s to Kindle', format='Azw')})
+    if 'PDF' in formats:
+        bookformats.append({'format': 'Pdf',
+                            'convert': 0,
+                            'text': _('Send %(format)s to Kindle', format='Pdf')})
+    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',
+                                      orig='Epub',
+                                      format='Mobi')})
+    if 'AZW3' in formats and not 'MOBI' in formats:
+        bookformats.append({'format': 'Mobi',
+                            'convert': 2,
+                            'text': _('Convert %(orig)s to %(format)s and send to Kindle',
+                                      orig='Azw3',
+                                      format='Mobi')})
+    return bookformats
+
+
 def check_send_to_kindle(entry):
     """
         returns all available book formats for sending to Kindle
     """
     if len(entry.data):
-        bookformats = list()
         if not config.config_converterpath:
-            # no converter - only for mobi and pdf formats
-            for ele in iter(entry.data):
-                if ele.uncompressed_size < config.mail_size:
-                    if 'MOBI' in ele.format:
-                        bookformats.append({'format': 'Mobi',
-                                            'convert': 0,
-                                            'text': _('Send %(format)s to Kindle', format='Mobi')})
-                    if 'PDF' in ele.format:
-                        bookformats.append({'format': 'Pdf',
-                                            'convert': 0,
-                                            'text': _('Send %(format)s to Kindle', format='Pdf')})
-                    if 'AZW' in ele.format:
-                        bookformats.append({'format': 'Azw',
-                                            'convert': 0,
-                                            'text': _('Send %(format)s to Kindle', format='Azw')})
+            book_formats = check_send_to_kindle_with_converter(entry)
         else:
-            formats = list()
-            for ele in iter(entry.data):
-                if ele.uncompressed_size < config.mail_size:
-                    formats.append(ele.format)
-            if 'MOBI' in formats:
-                bookformats.append({'format': 'Mobi',
-                                    'convert': 0,
-                                    'text': _('Send %(format)s to Kindle', format='Mobi')})
-            if 'AZW' in formats:
-                bookformats.append({'format': 'Azw',
-                                    'convert': 0,
-                                    'text': _('Send %(format)s to Kindle', format='Azw')})
-            if 'PDF' in formats:
-                bookformats.append({'format': 'Pdf',
-                                    'convert': 0,
-                                    'text': _('Send %(format)s to Kindle', format='Pdf')})
-            if config.config_converterpath:
-                if 'EPUB' in formats and not 'MOBI' in formats:
-                    bookformats.append({'format': 'Mobi',
-                                        'convert':1,
-                                        'text': _('Convert %(orig)s to %(format)s and send to Kindle',
-                                                  orig='Epub',
-                                                  format='Mobi')})
-                if 'AZW3' in formats and not 'MOBI' in formats:
-                    bookformats.append({'format': 'Mobi',
-                                        'convert': 2,
-                                        'text': _('Convert %(orig)s to %(format)s and send to Kindle',
-                                                  orig='Azw3',
-                                                  format='Mobi')})
-        return bookformats
+            book_formats = check_send_to_kindle_with_converter(entry)
+        return book_formats
     else:
         log.error(u'Cannot find book entry %d', entry.id)
         return None
@@ -221,9 +234,9 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
     for entry in iter(book.data):
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
-            worker.add_email(_(u"Send to Kindle"), book.path, converted_file_name,
-                             config.get_mail_settings(), kindle_mail, user_id,
-                             _(u"E-mail: %(book)s", book=book.title), _(u'This e-mail has been sent via Calibre-Web.'))
+            WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
+                             config.get_mail_settings(), kindle_mail,
+                             _(u"E-mail: %(book)s", book=book.title), _(u'This e-mail has been sent via Calibre-Web.')))
             return
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
@@ -343,66 +356,74 @@ def delete_book_file(book, calibrepath, book_format=None):
                                path=book.path)
 
 
-def update_dir_structure_file(book_id, calibrepath, first_author):
+# Moves files in file storage during author/title rename, or from temp dir to file storage
+def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename):
+    # get book database entry from id, if original path overwrite source with original_filepath
     localbook = calibre_db.get_book(book_id)
-    path = os.path.join(calibrepath, localbook.path)
+    if orignal_filepath:
+        path = orignal_filepath
+    else:
+        path = os.path.join(calibrepath, localbook.path)
 
+    # Create (current) authordir and titledir from database
     authordir = localbook.path.split('/')[0]
+    titledir = localbook.path.split('/')[1]
+
+    # Create new_authordir from parameter or from database
+    # Create new titledir from database and add id
     if first_author:
         new_authordir = get_valid_filename(first_author)
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name)
-
-    titledir = localbook.path.split('/')[1]
     new_titledir = get_valid_filename(localbook.title) + " (" + str(book_id) + ")"
 
-    if titledir != new_titledir:
-        new_title_path = os.path.join(os.path.dirname(path), new_titledir)
+    if titledir != new_titledir or authordir != new_authordir or orignal_filepath:
+        new_path = os.path.join(calibrepath, new_authordir, new_titledir)
+        new_name = get_valid_filename(localbook.title) + ' - ' + get_valid_filename(new_authordir)
         try:
-            if not os.path.exists(new_title_path):
-                os.renames(os.path.normcase(path), os.path.normcase(new_title_path))
+            if orignal_filepath:
+                if not os.path.isdir(new_path):
+                    os.makedirs(new_path)
+                shutil.move(os.path.normcase(path), os.path.normcase(os.path.join(new_path, db_filename)))
+                log.debug("Moving title: %s to %s/%s", path, new_path, new_name)
+                # Check new path is not valid path
             else:
-                log.info("Copying title: %s into existing: %s", path, new_title_path)
-                for dir_name, __, file_list in os.walk(path):
-                    for file in file_list:
-                        os.renames(os.path.normcase(os.path.join(dir_name, file)),
-                                   os.path.normcase(os.path.join(new_title_path + dir_name[len(path):], file)))
-            path = new_title_path
-            localbook.path = localbook.path.split('/')[0] + '/' + new_titledir
+                if not os.path.exists(new_path):
+                    # move original path to new path
+                    log.debug("Moving title: %s to %s", path, new_path)
+                    shutil.move(os.path.normcase(path), os.path.normcase(new_path))
+                else: # path is valid copy only files to new location (merge)
+                    log.info("Moving title: %s into existing: %s", path, new_path)
+                    # Take all files and subfolder from old path (strange command)
+                    for dir_name, __, file_list in os.walk(path):
+                        for file in file_list:
+                            shutil.move(os.path.normcase(os.path.join(dir_name, file)),
+                                            os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
+                            # os.unlink(os.path.normcase(os.path.join(dir_name, file)))
+            # change location in database to new author/title path
+            localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/')
         except OSError as ex:
-            log.error("Rename title from: %s to %s: %s", path, new_title_path, ex)
+            log.error("Rename title from: %s to %s: %s", path, new_path, ex)
             log.debug(ex, exc_info=True)
             return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
-                     src=path, dest=new_title_path, error=str(ex))
-    if authordir != new_authordir:
-        new_author_path = os.path.join(calibrepath, new_authordir, os.path.basename(path))
+                     src=path, dest=new_path, error=str(ex))
+
+        # Rename all files from old names to new names
         try:
-            os.renames(os.path.normcase(path), os.path.normcase(new_author_path))
-            localbook.path = new_authordir + '/' + localbook.path.split('/')[1]
-        except OSError as ex:
-            log.error("Rename author from: %s to %s: %s", path, new_author_path, ex)
-            log.debug(ex, exc_info=True)
-            return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
-                     src=path, dest=new_author_path, error=str(ex))
-    # Rename all files from old names to new names
-    if authordir != new_authordir or titledir != new_titledir:
-        new_name = ""
-        try:
-            new_name = get_valid_filename(localbook.title) + ' - ' + get_valid_filename(new_authordir)
-            path_name = os.path.join(calibrepath, new_authordir, os.path.basename(path))
             for file_format in localbook.data:
-                os.renames(os.path.normcase(
-                    os.path.join(path_name, file_format.name + '.' + file_format.format.lower())),
-                           os.path.normcase(os.path.join(path_name, new_name + '.' + file_format.format.lower())))
+                shutil.move(os.path.normcase(
+                    os.path.join(new_path, file_format.name + '.' + file_format.format.lower())),
+                    os.path.normcase(os.path.join(new_path, new_name + '.' + file_format.format.lower())))
                 file_format.name = new_name
+            if not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+                shutil.rmtree(os.path.dirname(path))
         except OSError as ex:
-            log.error("Rename file in path %s to %s: %s", path, new_name, ex)
+            log.error("Rename file in path %s to %s: %s", new_path, new_name, ex)
             log.debug(ex, exc_info=True)
             return _("Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s",
-                     src=path, dest=new_name, error=str(ex))
+                     src=new_path, dest=new_name, error=str(ex))
     return False
 
-
 def update_dir_structure_gdrive(book_id, first_author):
     error = False
     book = calibre_db.get_book(book_id)
@@ -505,11 +526,11 @@ def uniq(inpt):
 # ################################# External interface #################################
 
 
-def update_dir_stucture(book_id, calibrepath, first_author=None):
+def update_dir_stucture(book_id, calibrepath, first_author=None, orignal_filepath=None, db_filename=None):
     if config.config_use_google_drive:
         return update_dir_structure_gdrive(book_id, first_author)
     else:
-        return update_dir_structure_file(book_id, calibrepath, first_author)
+        return update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename)
 
 
 def delete_book(book, calibrepath, book_format):
@@ -550,8 +571,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)
@@ -574,29 +594,35 @@ 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()
-    else:
-        # check if file path exists, otherwise create it, copy file to calibre path and delete temp file
-        if not os.path.exists(filepath):
-            try:
-                os.makedirs(filepath)
-            except OSError:
-                log.error(u"Failed to create path for cover")
-                return False, _(u"Failed to create path for cover")
+    # check if file path exists, otherwise create it, copy file to calibre path and delete temp file
+    if not os.path.exists(filepath):
         try:
-            img.save(os.path.join(filepath, saved_filename))
-        except (IOError, OSError):
-            log.error(u"Cover-file is not a valid image file, or could not be stored")
-            return False, _(u"Cover-file is not a valid image file, or could not be stored")
+            os.makedirs(filepath)
+        except OSError:
+            log.error(u"Failed to create path for cover")
+            return False, _(u"Failed to create path for cover")
+    try:
+        # upload of jgp file without wand
+        if isinstance(img, requests.Response):
+            with open(os.path.join(filepath, saved_filename), 'wb') as f:
+                f.write(img.content)
+        else:
+            if hasattr(img, "metadata"):
+                # upload of jpg/png... via url
+                img.save(filename=os.path.join(filepath, saved_filename))
+                img.close()
+            else:
+                # upload of jpg/png... from hdd
+                img.save(os.path.join(filepath, saved_filename))
+    except (IOError, OSError):
+        log.error(u"Cover-file is not a valid image file, or could not be stored")
+        return False, _(u"Cover-file is not a valid image file, or could not be stored")
     return True, None
 
 
@@ -604,31 +630,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:
@@ -682,7 +710,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')
 
 
@@ -722,47 +750,30 @@ def format_runtime(runtime):
 # helper function to apply localize status information in tasklist entries
 def render_task_status(tasklist):
     renderedtasklist = list()
-    for task in tasklist:
-        if task['user'] == current_user.nickname or current_user.role_admin():
-            if task['formStarttime']:
-                task['starttime'] = format_datetime(task['formStarttime'], format='short', locale=get_locale())
-            # task2['formStarttime'] = ""
-            else:
-                if 'starttime' not in task:
-                    task['starttime'] = ""
-
-            if 'formRuntime' not in task:
-                task['runtime'] = ""
-            else:
-                task['runtime'] = format_runtime(task['formRuntime'])
+    for __, user, added, task in tasklist:
+        if user == current_user.nickname or current_user.role_admin():
+            ret = {}
+            if task.start_time:
+                ret['starttime'] = format_datetime(task.start_time, format='short', locale=get_locale())
+                ret['runtime'] = format_runtime(task.runtime)
 
             # localize the task status
-            if isinstance(task['stat'], int):
-                if task['stat'] == STAT_WAITING:
-                    task['status'] = _(u'Waiting')
-                elif task['stat'] == STAT_FAIL:
-                    task['status'] = _(u'Failed')
-                elif task['stat'] == STAT_STARTED:
-                    task['status'] = _(u'Started')
-                elif task['stat'] == STAT_FINISH_SUCCESS:
-                    task['status'] = _(u'Finished')
+            if isinstance(task.stat, int):
+                if task.stat == STAT_WAITING:
+                    ret['status'] = _(u'Waiting')
+                elif task.stat == STAT_FAIL:
+                    ret['status'] = _(u'Failed')
+                elif task.stat == STAT_STARTED:
+                    ret['status'] = _(u'Started')
+                elif task.stat == STAT_FINISH_SUCCESS:
+                    ret['status'] = _(u'Finished')
                 else:
-                    task['status'] = _(u'Unknown Status')
+                    ret['status'] = _(u'Unknown Status')
 
-            # localize the task type
-            if isinstance(task['taskType'], int):
-                if task['taskType'] == TASK_EMAIL:
-                    task['taskMessage'] = _(u'E-mail: ') + task['taskMess']
-                elif task['taskType'] == TASK_CONVERT:
-                    task['taskMessage'] = _(u'Convert: ') + task['taskMess']
-                elif task['taskType'] == TASK_UPLOAD:
-                    task['taskMessage'] = _(u'Upload: ') + task['taskMess']
-                elif task['taskType'] == TASK_CONVERT_ANY:
-                    task['taskMessage'] = _(u'Convert: ') + task['taskMess']
-                else:
-                    task['taskMessage'] = _(u'Unknown Task: ') + task['taskMess']
-
-            renderedtasklist.append(task)
+            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message)
+            ret['progress'] = "{} %".format(int(task.progress * 100))
+            ret['user'] = user
+            renderedtasklist.append(ret)
 
     return renderedtasklist
 
diff --git a/cps/isoLanguages.py b/cps/isoLanguages.py
index d8b7fa00..896d4faf 100644
--- a/cps/isoLanguages.py
+++ b/cps/isoLanguages.py
@@ -66,3 +66,27 @@ def get_language_codes(locale, language_names, remainder=None):
     if remainder is not None:
         remainder.extend(language_names)
     return languages
+
+def get_valid_language_codes(locale, language_names, remainder=None):
+    languages = list()
+    if "" in language_names:
+        language_names.remove("")
+    for k, __ in get_language_names(locale).items():
+        if k in language_names:
+            languages.append(k)
+            language_names.remove(k)
+    if remainder is not None and len(language_names):
+        remainder.extend(language_names)
+    return languages
+
+def get_lang3(lang):
+    try:
+        if len(lang) == 2:
+            ret_value = get(part1=lang).part3
+        elif len(lang) == 3:
+            ret_value = lang
+        else:
+            ret_value = ""
+    except KeyError:
+        ret_value = lang
+    return ret_value
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 2e6ec680..98368449 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -14,996 +14,996 @@ from __future__ import unicode_literals
 # map iso639 language codes to language names, translated
 
 LANGUAGE_NAMES = {
-    "pl": {
-        "aar": "afarski",
-        "abk": "abchaski",
-        "ace": "aczineski",
-        "ach": "aczoli",
-        "ada": "adangme",
-        "ady": "adygejski",
-        "afh": "afrihili",
-        "afr": "afrykanerski",
-        "ain": "ajnoski (Japonia)",
-        "aka": "akan",
-        "akk": "akadyjski",
-        "ale": "aleucki",
-        "alt": "ałtajski południowy",
-        "amh": "amharski",
-        "ang": "Staroangielski (ok. 450-1100)",
+    "cs": {
+        "aar": "afarština",
+        "abk": "abchazajština",
+        "ace": "atěžština",
+        "ach": "ačoli (luoština)",
+        "ada": "adangmeština",
+        "ady": "adyghe",
+        "afh": "afrihilijština",
+        "afr": "afrikánština",
+        "ain": "ainu (Japonsko)",
+        "aka": "akanština",
+        "akk": "akkadština",
+        "ale": "aleutština",
+        "alt": "altajština; jižní",
+        "amh": "Amharština",
+        "ang": "Angličtina; stará (asi 450-1100)",
         "anp": "angika",
-        "ara": "arabski",
-        "arc": "aramejski oficjalny (700-300 p.n.e.)",
-        "arg": "aragoński",
-        "arn": "araukański",
+        "ara": "arabština",
+        "arc": "aramejština; oficiální (700-300 př. n. l.)",
+        "arg": "aragonská španělština",
+        "arn": "mapudungun",
         "arp": "arapaho",
-        "arw": "arawak",
-        "asm": "asamski",
-        "ast": "asturyjski",
-        "ava": "awarski",
-        "ave": "awestyjski",
-        "awa": "awadhi",
-        "aym": "ajmara",
-        "aze": "azerski",
-        "bak": "baszkirski",
-        "bal": "baluczi",
-        "bam": "bambara",
-        "ban": "balijski",
+        "arw": "arawacké jazyky",
+        "asm": "ásámština",
+        "ast": "asturština",
+        "ava": "avarština",
+        "ave": "avestština",
+        "awa": "avadhština (avadhí)",
+        "aym": "aymarština",
+        "aze": "azerbajdžánština",
+        "bak": "Baskirština",
+        "bal": "balúčština",
+        "bam": "bambarština",
+        "ban": "balijština",
         "bas": "basa (Kamerun)",
-        "bej": "bedża",
-        "bel": "białoruski",
-        "bem": "bemba (Zambia)",
-        "ben": "bengalski",
-        "bho": "bhodźpuri",
-        "bik": "bikol",
-        "bin": "edo",
-        "bis": "bislama",
+        "bej": "bedža",
+        "bel": "běloruština",
+        "bem": "bemba (Zambie)",
+        "ben": "bengálština",
+        "bho": "bhódžpurština",
+        "bik": "bikolština",
+        "bin": "bini",
+        "bis": "bislamština",
         "bla": "siksika",
-        "bod": "tybetański",
-        "bos": "bośniacki",
-        "bra": "bradź",
-        "bre": "bretoński",
-        "bua": "buriacki",
-        "bug": "bugijski",
-        "bul": "bułgarski",
-        "byn": "blin",
-        "cad": "kaddo",
-        "car": "karaibski galibi",
-        "cat": "kataloński",
-        "ceb": "cebuański",
-        "ces": "czeski",
-        "cha": "czamorro",
-        "chb": "czibcza",
-        "che": "czeczeński",
-        "chg": "czagatajski",
-        "chk": "chuuk",
-        "chm": "maryjski (Rosja)",
-        "chn": "żargon chinoocki",
-        "cho": "czoktaw",
-        "chp": "chipewyan",
-        "chr": "czerokeski",
-        "chu": "starosłowiański",
-        "chv": "czuwaski",
-        "chy": "czejeński",
-        "cop": "koptyjski",
-        "cor": "kornijski",
-        "cos": "korsykański",
-        "cre": "kri",
-        "crh": "krymskotatarski",
-        "csb": "kaszubski",
-        "cym": "walijski",
-        "dak": "dakota",
-        "dan": "duński",
-        "dar": "dargwijski",
-        "del": "delaware",
-        "den": "slavey (atapaskański)",
-        "deu": "niemiecki",
+        "bod": "tibetština",
+        "bos": "bosenština",
+        "bra": "bradžština",
+        "bre": "bretonština",
+        "bua": "burjatština",
+        "bug": "bugiština",
+        "bul": "bulharština",
+        "byn": "bilin",
+        "cad": "caddo",
+        "car": "carib; Galibi",
+        "cat": "katalánština",
+        "ceb": "cebuánština",
+        "ces": "Čeština",
+        "cha": "čamoro",
+        "chb": "čibča",
+        "che": "čečenština",
+        "chg": "Chagatai",
+        "chk": "čukčtina",
+        "chm": "Mari (Russia)",
+        "chn": "činuk pidžin",
+        "cho": "choctawština",
+        "chp": "čipeva",
+        "chr": "čerokézština",
+        "chu": "Slavonic; Old",
+        "chv": "čuvaština",
+        "chy": "čejenština",
+        "cop": "koptština",
+        "cor": "kornština",
+        "cos": "korsičtina",
+        "cre": "krí",
+        "crh": "Turkish; Crimean",
+        "csb": "kašubština",
+        "cym": "velština",
+        "dak": "dakotština",
+        "dan": "dánština",
+        "dar": "dargwa",
+        "del": "delawarština",
+        "den": "atabaské jazyky",
+        "deu": "Němčina",
         "dgr": "dogrib",
-        "din": "dinka",
-        "div": "malediwski; divehi",
-        "doi": "dogri (makrojęzyk)",
-        "dsb": "dolnołużycki",
-        "dua": "duala",
-        "dum": "holenderski średniowieczny (ok. 1050-1350)",
-        "dyu": "diula",
-        "dzo": "dzongka",
+        "din": "dinkština",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolanguage)",
+        "dsb": "Sorbian; Lower",
+        "dua": "dualština",
+        "dum": "Dutch; Middle (ca. 1050-1350)",
+        "dyu": "djula",
+        "dzo": "Bhútánština",
         "efi": "efik",
-        "egy": "egipski (starożytny)",
+        "egy": "egyptština (starověká)",
         "eka": "ekajuk",
-        "ell": "grecki współczesny (1453-)",
-        "elx": "elamicki",
-        "eng": "Angielski",
-        "enm": "angielski średniowieczny (1100-1500)",
+        "ell": "řečtina; moderní (1453-)",
+        "elx": "elamština",
+        "eng": "Angličtina",
+        "enm": "Angličtina; středověká (1100-1500)",
         "epo": "esperanto",
-        "est": "estoński",
-        "eus": "baskijski",
-        "ewe": "ewe",
+        "est": "estonština",
+        "eus": "baskičtina",
+        "ewe": "eweština",
         "ewo": "ewondo",
-        "fan": "fang (Gwinea Równikowa)",
-        "fao": "farerski",
-        "fas": "perski",
-        "fat": "fanti",
-        "fij": "fidżyjski",
-        "fil": "pilipino",
-        "fin": "fiński",
-        "fon": "fon",
-        "fra": "francuski",
-        "frm": "francuski średniowieczny (ok. 1400-1600)",
-        "fro": "starofrancuski (842-ok. 1400)",
-        "frr": "północnofryzyjski",
-        "frs": "wschodniofryzyjski",
-        "fry": "zachodniofryzyjski",
-        "ful": "fulani",
-        "fur": "friulski",
+        "fan": "Fang (Equatorial Guinea)",
+        "fao": "faerština",
+        "fas": "perština",
+        "fat": "fantiština",
+        "fij": "Fidži",
+        "fil": "Filipino",
+        "fin": "finština",
+        "fon": "fonština",
+        "fra": "francouzština",
+        "frm": "French; Middle (ca. 1400-1600)",
+        "fro": "French; Old (842-ca. 1400)",
+        "frr": "Frisian; Northern",
+        "frs": "Frisian; Eastern",
+        "fry": "Frisian; Western",
+        "ful": "fulahština",
+        "fur": "furlanština",
         "gaa": "ga",
         "gay": "gayo",
-        "gba": "gbaya (Republika Środkowoafrykańska)",
-        "gez": "gyyz",
-        "gil": "gilbertański",
-        "gla": "szkocki gaelicki",
-        "gle": "irlandzki",
-        "glg": "galicyjski",
-        "glv": "manx",
-        "gmh": "średnio-wysoko-niemiecki (ok. 1050-1500)",
-        "goh": "staro-wysoko-niemiecki (ok. 750-1050)",
-        "gon": "gondi",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "etiopština",
+        "gil": "kiribatština",
+        "gla": "Gaelic; Scottish",
+        "gle": "irština",
+        "glg": "Galician",
+        "glv": "manština",
+        "gmh": "German; Middle High (ca. 1050-1500)",
+        "goh": "German; Old High (ca. 750-1050)",
+        "gon": "góndština",
         "gor": "gorontalo",
-        "got": "gocki",
+        "got": "gótština",
         "grb": "grebo",
-        "grc": "grecki starożytny (do 1453)",
-        "grn": "guarani",
-        "gsw": "niemiecki szwajcarski",
-        "guj": "gudźarati",
-        "gwi": "gwichʼin",
+        "grc": "řečtina; starověká (do 1453)",
+        "grn": "Guaranština",
+        "gsw": "German; Swiss",
+        "guj": "Gudžarátština",
+        "gwi": "Gwichʼin",
         "hai": "haida",
-        "hat": "kreolski haitański",
-        "hau": "hausa",
-        "haw": "hawajski",
-        "heb": "hebrajski",
+        "hat": "Creole; Haitian",
+        "hau": "Hausa",
+        "haw": "havajština",
+        "heb": "hebrejština",
         "her": "herero",
-        "hil": "hiligajnon",
-        "hin": "hindi",
-        "hit": "hetycki",
-        "hmn": "hmong",
+        "hil": "hiligayonština",
+        "hin": "hindština",
+        "hit": "chetitština",
+        "hmn": "hmongština",
         "hmo": "hiri motu",
-        "hrv": "chorwacki",
-        "hsb": "górnołużycki",
-        "hun": "węgierski",
+        "hrv": "chorvatština",
+        "hsb": "Sorbian; Upper",
+        "hun": "maďarština",
         "hup": "hupa",
-        "hye": "ormiański",
-        "iba": "ibanag",
-        "ibo": "ibo",
+        "hye": "arménština",
+        "iba": "iban",
+        "ibo": "igbo",
         "ido": "ido",
-        "iii": "syczuański",
-        "iku": "inuktitut",
-        "ile": "interlingue",
-        "ilo": "ilokano",
-        "ina": "interlingua (Międzynarodowe Stowarzyszenie Języka Pomocniczego)",
-        "ind": "indonezyjski",
-        "inh": "inguski",
-        "ipk": "inupiaq",
-        "isl": "islandzki",
-        "ita": "włoski",
-        "jav": "jawajski",
+        "iii": "Yi; Sichuan",
+        "iku": "Inuktitutština",
+        "ile": "Interlingue",
+        "ilo": "ilokánština",
+        "ina": "Interlingua (Mezinárodní pomocná jazyková asociace)",
+        "ind": "indonézština",
+        "inh": "inguština",
+        "ipk": "Inupiakština",
+        "isl": "islandština",
+        "ita": "italština",
+        "jav": "jávština",
         "jbo": "lojban",
-        "jpn": "japoński",
-        "jpr": "judeo-perski",
-        "jrb": "judeoarabski",
-        "kaa": "karakałpacki",
-        "kab": "kabylski",
-        "kac": "kaczin",
-        "kal": "kalaallisut",
-        "kam": "kamba (Kenia)",
-        "kan": "kannada",
-        "kas": "kaszmirski",
-        "kat": "gruziński",
+        "jpn": "japonština",
+        "jpr": "judeo-perština",
+        "jrb": "judeo-arabština",
+        "kaa": "karakalpačtina",
+        "kab": "kabulí",
+        "kac": "kačjinština",
+        "kal": "Kalaallisut",
+        "kam": "Kamba (Kenya)",
+        "kan": "Kannadština",
+        "kas": "kašmírština",
+        "kat": "Gruzínština",
         "kau": "kanuri",
         "kaw": "kawi",
-        "kaz": "kazaski",
-        "kbd": "kabardyjski",
-        "kha": "khasi",
-        "khm": "środkowokhmerski",
-        "kho": "chotański",
-        "kik": "kikiju",
-        "kin": "ruanda",
-        "kir": "kirgiski",
-        "kmb": "kimbundu",
-        "kok": "konkani (makrojęzyk)",
-        "kom": "komi",
-        "kon": "kongo",
-        "kor": "koreański",
-        "kos": "kosrae",
+        "kaz": "Kazachština",
+        "kbd": "kabardština",
+        "kha": "Khasi",
+        "khm": "Khmer; Central",
+        "kho": "chotánština",
+        "kik": "Kikuyu",
+        "kin": "Kinyarwandština",
+        "kir": "Kirgizština",
+        "kmb": "kimbundština",
+        "kok": "Konkani (macrolanguage)",
+        "kom": "komijština",
+        "kon": "Kongo",
+        "kor": "korejština",
+        "kos": "kosrajština",
         "kpe": "kpelle",
-        "krc": "karaczajsko-bałkarski",
-        "krl": "karelski",
+        "krc": "karachay-balkarština",
+        "krl": "karelština",
         "kru": "kurukh",
-        "kua": "kwanyama",
-        "kum": "kumycki",
-        "kur": "kurdyjski",
+        "kua": "Kuanyama",
+        "kum": "kumyčtina",
+        "kur": "kurdština",
         "kut": "kutenai",
         "lad": "ladino",
         "lah": "lahnda",
-        "lam": "lamba",
-        "lao": "laotański",
-        "lat": "łaciński",
-        "lav": "łotewski",
-        "lez": "lezgiński",
-        "lim": "limburgijski",
-        "lin": "lingala",
-        "lit": "litewski",
-        "lol": "mongo",
-        "loz": "lozi",
-        "ltz": "luksemburski",
-        "lua": "luba-lulua",
-        "lub": "luba-katanga",
-        "lug": "luganda",
-        "lui": "luiseno",
-        "lun": "lunda",
-        "luo": "luo (Kenia i Tanzania)",
-        "lus": "lushai",
-        "mad": "madurajski",
-        "mag": "magahi",
-        "mah": "marshalski",
-        "mai": "maithili",
-        "mak": "makasar",
-        "mal": "malajalam",
-        "man": "mandingo",
-        "mar": "marathi",
-        "mas": "masajski",
-        "mdf": "moksza",
-        "mdr": "mandar",
-        "men": "mende (Sierra Leone)",
-        "mga": "irlandzki średniowieczny (900-1200)",
-        "mic": "micmac",
+        "lam": "lambština",
+        "lao": "Laoština",
+        "lat": "latina",
+        "lav": "Latvian",
+        "lez": "lezgiština",
+        "lim": "Limburgan",
+        "lin": "Ngalština",
+        "lit": "litevština",
+        "lol": "mongština",
+        "loz": "lozština",
+        "ltz": "Luxembourgish",
+        "lua": "luba-luluaština",
+        "lub": "lubu-katanžština",
+        "lug": "Ganda",
+        "lui": "luiseňo",
+        "lun": "lundština",
+        "luo": "luoština (Keňa a Tanzanie)",
+        "lus": "lušáí",
+        "mad": "madurština",
+        "mag": "magahština",
+        "mah": "Marshallese",
+        "mai": "maithilština",
+        "mak": "makasarština",
+        "mal": "Malabarština",
+        "man": "mandingština",
+        "mar": "maráthština",
+        "mas": "masajština",
+        "mdf": "moksha",
+        "mdr": "mandarínština",
+        "men": "Mende (Sierra Leone)",
+        "mga": "irština; středověká (900-1200)",
+        "mic": "Mi'kmaq",
         "min": "minangkabau",
-        "mis": "języki niezakodowane",
-        "mkd": "macedoński",
-        "mlg": "malgaski",
-        "mlt": "maltański",
-        "mnc": "mandżurski",
-        "mni": "manipuri",
+        "mis": "Uncoded languages",
+        "mkd": "makedonština",
+        "mlg": "Malgaština",
+        "mlt": "maltézština",
+        "mnc": "manchu",
+        "mni": "manipurština",
         "moh": "mohawk",
-        "mon": "mongolski",
-        "mos": "mossi",
-        "mri": "maoryski",
-        "msa": "malajski (makrojęzyk)",
-        "mul": "wiele języków",
-        "mus": "krik",
-        "mwl": "mirandyjski",
-        "mwr": "marwari",
-        "mya": "birmański",
-        "myv": "erzja",
-        "nap": "neapolitański",
-        "nau": "nauruański",
-        "nav": "navaho",
-        "nbl": "ndebele południowy",
-        "nde": "ndebele północny",
-        "ndo": "ndonga",
+        "mon": "mongolština",
+        "mos": "mosi",
+        "mri": "maorština",
+        "msa": "Malay (macrolanguage)",
+        "mul": "násobné jazyky",
+        "mus": "krík",
+        "mwl": "mirandština",
+        "mwr": "márvárština",
+        "mya": "Barmština",
+        "myv": "erzya",
+        "nap": "neapolština",
+        "nau": "naurština",
+        "nav": "navažština",
+        "nbl": "Ndebele; South",
+        "nde": "Ndebele; North",
+        "ndo": "ndondština",
         "nds": "German; Low",
-        "nep": "nepalski",
-        "new": "newarski",
+        "nep": "nepálština",
+        "new": "Bhasa; Nepal",
         "nia": "nias",
         "niu": "niue",
-        "nld": "holenderski",
-        "nno": "norweski Nynorsk",
-        "nob": "norweski Bokmål",
-        "nog": "nogajski",
-        "non": "staronordyjski",
-        "nor": "norweski",
-        "nqo": "n’ko",
-        "nso": "sotho północny",
-        "nwc": "newarski klasyczny",
-        "nya": "njandża",
-        "nym": "nyamwezi",
-        "nyn": "nyankole",
-        "nyo": "nyoro",
-        "nzi": "nzema",
-        "oci": "okcytański (po 1500)",
-        "oji": "odżibwe",
+        "nld": "holandština",
+        "nno": "Norwegian Nynorsk",
+        "nob": "Norwegian Bokmål",
+        "nog": "nogai",
+        "non": "norština; stará",
+        "nor": "norština",
+        "nqo": "N'Ko",
+        "nso": "Sotho; Northern",
+        "nwc": "Newari; Old",
+        "nya": "Nyanja",
+        "nym": "ňamwežština",
+        "nyn": "nyankolština",
+        "nyo": "Nyoro",
+        "nzi": "nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
         "ori": "orija",
-        "orm": "oromo",
-        "osa": "osage",
-        "oss": "osetyjski",
-        "ota": "turecki otomański (1500-1928)",
-        "pag": "pangasino",
-        "pal": "pahlawi",
-        "pam": "pampango",
-        "pan": "pendżabski",
+        "orm": "Oromo (Afan)",
+        "osa": "osagština",
+        "oss": "Ossetian",
+        "ota": "turečtina; osmanská (1500-1928)",
+        "pag": "pangsinan",
+        "pal": "pahlaví",
+        "pam": "pampangau",
+        "pan": "Panjabi",
         "pap": "papiamento",
-        "pau": "palau",
-        "peo": "staroperski (ok. 600-400 p.n.e)",
-        "phn": "fenicki",
-        "pli": "pali",
-        "pol": "Polski",
-        "pon": "pohnpei",
-        "por": "portugalski",
-        "pro": "prowansalski średniowieczny (do 1500)",
-        "pus": "paszto",
-        "que": "keczua",
-        "raj": "radźasthani",
-        "rap": "rapanui",
-        "rar": "maoryski Wysp Cooka",
-        "roh": "retoromański",
-        "rom": "romski",
-        "ron": "rumuński",
-        "run": "rundi",
-        "rup": "arumuński",
-        "rus": "rosyjski",
-        "sad": "sandawe",
-        "sag": "sango",
-        "sah": "jakucki",
-        "sam": "samarytański aramejski",
-        "san": "sanskryt",
-        "sas": "sasak",
-        "sat": "santali",
-        "scn": "sycylijski",
-        "sco": "scots",
-        "sel": "selkupski",
-        "sga": "staroirlandzki (do 900)",
-        "shn": "szan",
+        "pau": "palauština",
+        "peo": "Persian; Old (ca. 600-400 B.C.)",
+        "phn": "Slovinština",
+        "pli": "páli",
+        "pol": "Polština",
+        "pon": "pohnpeiština",
+        "por": "portugalština",
+        "pro": "provensálština; stará (do 1500)",
+        "pus": "pašto",
+        "que": "kečuánština",
+        "raj": "rádžasthánština",
+        "rap": "rapanuiština",
+        "rar": "Maori; Cook Islands",
+        "roh": "Romansh",
+        "rom": "římština",
+        "ron": "rumunština",
+        "run": "Kirundi",
+        "rup": "Romanian; Macedo-",
+        "rus": "Ruština",
+        "sad": "sandawština",
+        "sag": "sangoština",
+        "sah": "jakutština",
+        "sam": "Aramaic; Samaritan",
+        "san": "sanskrt",
+        "sas": "sačtina",
+        "sat": "santálí",
+        "scn": "sicilština",
+        "sco": "skotština",
+        "sel": "selkupština",
+        "sga": "irština; stará (do 900)",
+        "shn": "šanština",
         "sid": "sidamo",
-        "sin": "syngaleski",
-        "slk": "słowacki",
-        "slv": "słoweński",
-        "sma": "południowolapoński",
-        "sme": "północnolapoński",
-        "smj": "lapoński lule",
-        "smn": "lapoński inari",
-        "smo": "samoański",
-        "sms": "lapoński skolt",
-        "sna": "shona",
-        "snd": "sindhi",
-        "snk": "soninke",
-        "sog": "sogdiański",
-        "som": "somalijski",
-        "sot": "sotho południowy",
-        "spa": "hiszpański",
-        "sqi": "albański",
-        "srd": "sardyński",
-        "srn": "sranan tongo",
-        "srp": "serbski",
-        "srr": "serer",
-        "ssw": "suazi",
+        "sin": "Sinhálština",
+        "slk": "Slovenština",
+        "slv": "slovinština",
+        "sma": "Sami; Southern",
+        "sme": "Sami; Northern",
+        "smj": "lule sami",
+        "smn": "Sami; Inari",
+        "smo": "Samoyština",
+        "sms": "Sami; Skolt",
+        "sna": "šonština",
+        "snd": "sindhština",
+        "snk": "sonikština",
+        "sog": "sogdijština",
+        "som": "somálština",
+        "sot": "sotština; jižní",
+        "spa": "španělština",
+        "sqi": "albánština",
+        "srd": "sardinština",
+        "srn": "Sranan Tongo",
+        "srp": "srbština",
+        "srr": "Serer",
+        "ssw": "Siswatština",
         "suk": "sukuma",
-        "sun": "sundajski",
+        "sun": "Sundanština",
         "sus": "susu",
-        "sux": "sumeryjski",
-        "swa": "suahili (makrojęzyk)",
-        "swe": "szwedzki",
-        "syc": "syryjski klasyczny",
-        "syr": "syryjski",
-        "tah": "tahitański",
-        "tam": "tamilski",
-        "tat": "tatarski",
-        "tel": "telugu",
+        "sux": "sumerština",
+        "swa": "svahilština (makrojazyk)",
+        "swe": "švédština",
+        "syc": "Syriac; Classical",
+        "syr": "syrština",
+        "tah": "tahitština",
+        "tam": "Tamilština",
+        "tat": "tatarština",
+        "tel": "Telugu",
         "tem": "temne",
         "ter": "tereno",
-        "tet": "tetum",
-        "tgk": "tadżycki",
-        "tgl": "tagalski",
-        "tha": "tajski",
-        "tig": "tigre",
-        "tir": "tigrinia",
-        "tiv": "tiw",
-        "tkl": "tokelau",
-        "tlh": "klingoński",
+        "tet": "tetumština",
+        "tgk": "Tádžičtina",
+        "tgl": "Tagalog",
+        "tha": "thajština",
+        "tig": "tigrejština",
+        "tir": "Tigrinijština",
+        "tiv": "tivština",
+        "tkl": "tokelauština",
+        "tlh": "Klingon",
         "tli": "tlingit",
-        "tmh": "tuareski",
-        "tog": "tongański (Nyasa)",
-        "ton": "tongański (Wyspy Tonga)",
+        "tmh": "Tamashek",
+        "tog": "tongština (nyasa)",
+        "ton": "Tonga",
         "tpi": "tok pisin",
-        "tsi": "tsimszian",
-        "tsn": "tswana",
-        "tso": "tsonga",
-        "tuk": "turkmeński",
-        "tum": "tumbuka",
-        "tur": "turecki",
-        "tvl": "tuvalu",
-        "twi": "twi",
-        "tyv": "tuwiński",
-        "udm": "udmurcki",
-        "uga": "ugarycki",
-        "uig": "ujgurski",
-        "ukr": "ukraiński",
+        "tsi": "tsimshijské jazyky",
+        "tsn": "Setswanština",
+        "tso": "Tsonga",
+        "tuk": "turkmenistánština",
+        "tum": "tumbukština",
+        "tur": "turečtina",
+        "tvl": "tuvalština",
+        "twi": "ťwiština",
+        "tyv": "tuvština",
+        "udm": "udmurtština",
+        "uga": "ugaritština",
+        "uig": "Uighurština",
+        "ukr": "ukrajinština",
         "umb": "umbundu",
-        "und": "nieokreślony",
-        "urd": "urdu",
-        "uzb": "uzbecki",
-        "vai": "wai",
-        "ven": "venda",
-        "vie": "wietnamski",
-        "vol": "wolapik",
-        "vot": "wotycki",
-        "wal": "walamo",
-        "war": "warajski (Filipiny)",
+        "und": "neurčitý",
+        "urd": "urdština",
+        "uzb": "uzbekistánština",
+        "vai": "vai",
+        "ven": "vendština",
+        "vie": "vietnamština",
+        "vol": "volapük",
+        "vot": "votiatština",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippines)",
         "was": "washo",
-        "wln": "waloński",
-        "wol": "wolof",
-        "xal": "kałmucki",
-        "xho": "xhosa",
-        "yao": "yao",
-        "yap": "japski",
-        "yid": "jidysz",
-        "yor": "joruba",
-        "zap": "zapotecki",
-        "zbl": "bliss",
+        "wln": "valonština",
+        "wol": "volofština",
+        "xal": "Kalmyk",
+        "xho": "xhoština",
+        "yao": "jaoština",
+        "yap": "japština",
+        "yid": "Jidiš",
+        "yor": "jorubština",
+        "zap": "Zapotec",
+        "zbl": "Blissymbols",
         "zen": "zenaga",
-        "zha": "zhuang",
-        "zho": "chiński",
-        "zul": "zuluski",
-        "zun": "zuni",
-        "zxx": "brak kontekstu językowego",
-        "zza": "zazaki"
+        "zha": "Zhuang",
+        "zho": "čínština",
+        "zul": "Zulu",
+        "zun": "zunijština",
+        "zxx": "bez lingvistického obsahu",
+        "zza": "zaza"
     },
-    "nl": {
-        "aar": "Afar; Hamitisch",
-        "abk": "Abchazisch",
-        "ace": "Achinees",
-        "ach": "Acholi",
-        "ada": "Adangme",
-        "ady": "Adyghe",
+    "de": {
+        "aar": "Danakil-Sprache",
+        "abk": "Abchasisch",
+        "ace": "Aceh-Sprache",
+        "ach": "Acholi-Sprache",
+        "ada": "Adangme-Sprache",
+        "ady": "Adygisch",
         "afh": "Afrihili",
         "afr": "Afrikaans",
-        "ain": "Ainu (Japan)",
-        "aka": "Akaans",
-        "akk": "Akkadiaans",
-        "ale": "Aleut",
-        "alt": "Altajs; zuidelijk",
-        "amh": "Amhaars; Amharisch",
-        "ang": "Engels; oud (ca. 450-1100)",
-        "anp": "Angika",
+        "ain": "Ainu-Sprache (Japan)",
+        "aka": "Akan-Sprache",
+        "akk": "Akkadisch",
+        "ale": "Aleutisch",
+        "alt": "Altaisch; Süd",
+        "amh": "Amharisch",
+        "ang": "Englisch; Alt (ca. 450-1100)",
+        "anp": "Anga-Sprache",
         "ara": "Arabisch",
-        "arc": "Aramees; officieel (700-300 B.C.)",
-        "arg": "Aragonees",
+        "arc": "Aramäisch",
+        "arg": "Aragonesisch",
         "arn": "Mapudungun",
         "arp": "Arapaho",
-        "arw": "Arawak",
-        "asm": "Assamees; Assami",
+        "arw": "Arawakisch",
+        "asm": "Assamesisch",
         "ast": "Asturisch",
-        "ava": "Avaars; Awari",
+        "ava": "Awarisch",
         "ave": "Avestisch",
         "awa": "Awadhi",
         "aym": "Aymara",
-        "aze": "Azerbeidzjaans",
-        "bak": "Basjkiers; Basjkirisch",
-        "bal": "Balutsji; Baluchi",
+        "aze": "Aserbaidschanisch",
+        "bak": "Baschkirisch",
+        "bal": "Belutschisch",
         "bam": "Bambara",
-        "ban": "Balinees",
-        "bas": "Basa (Kameroen)",
-        "bej": "Beja",
-        "bel": "Wit-Russisch; Belarussisch",
-        "bem": "Bemba (Zambia)",
-        "ben": "Bengaals",
+        "ban": "Balinesisch",
+        "bas": "Basa (Kamerun)",
+        "bej": "Bedja (Bedauye)",
+        "bel": "Weißrussisch",
+        "bem": "Bemba (Sambia)",
+        "ben": "Bengalisch",
         "bho": "Bhojpuri",
         "bik": "Bikol",
-        "bin": "Bini; Edo",
+        "bin": "Bini",
         "bis": "Bislama",
-        "bla": "Siksika",
-        "bod": "Tibetaans",
+        "bla": "Blackfoot",
+        "bod": "Tibetisch",
         "bos": "Bosnisch",
-        "bra": "Braj",
-        "bre": "Bretons; Bretoens",
-        "bua": "Boeriaats",
-        "bug": "Buginees",
-        "bul": "Bulgaars",
+        "bra": "Braj-Bhakha",
+        "bre": "Bretonisch",
+        "bua": "Burjatisch",
+        "bug": "Buginesisch",
+        "bul": "Bulgarisch",
         "byn": "Bilin",
         "cad": "Caddo",
-        "car": "Caribische talen",
-        "cat": "Catalaans",
+        "car": "Karibisch; Galíbi",
+        "cat": "Katalanisch",
         "ceb": "Cebuano",
-        "ces": "Tsjechisch",
+        "ces": "Tschechisch",
         "cha": "Chamorro",
-        "chb": "Tsjibtsja",
-        "che": "Tsjetsjeens",
-        "chg": "Chagatai",
-        "chk": "Chukees",
-        "chm": "Mari (Rusland)",
-        "chn": "Chinook-jargon",
+        "chb": "Chibcha",
+        "che": "Tschetschenisch",
+        "chg": "Tschagataisch",
+        "chk": "Trukesisch",
+        "chm": "Mari (Russland)",
+        "chn": "Chinook",
         "cho": "Choctaw",
-        "chp": "Chipewyaans",
+        "chp": "Chipewyan",
         "chr": "Cherokee",
-        "chu": "Slavisch; oud (kerk)",
-        "chv": "Tsjoevasjisch",
+        "chu": "Altkirchenslawisch",
+        "chv": "Tschuwaschisch",
         "chy": "Cheyenne",
         "cop": "Koptisch",
-        "cor": "Cornisch",
-        "cos": "Corsicaans",
+        "cor": "Kornisch",
+        "cos": "Korsisch",
         "cre": "Cree",
-        "crh": "Turks; Crimean",
-        "csb": "Kasjoebiaans",
-        "cym": "Welsh",
+        "crh": "Türkisch; Krimtatarisch",
+        "csb": "Kaschubisch",
+        "cym": "Walisisch",
         "dak": "Dakota",
-        "dan": "Deens",
-        "dar": "Dargwa",
+        "dan": "Dänisch",
+        "dar": "Darginisch",
         "del": "Delaware",
-        "den": "Slavisch (Athapascaans)",
-        "deu": "Duits",
+        "den": "Slave (Athapaskisch)",
+        "deu": "Deutsch",
         "dgr": "Dogrib",
         "din": "Dinka",
-        "div": "Divehi",
-        "doi": "Dogri",
-        "dsb": "Sorbisch; lager",
+        "div": "Dhivehi",
+        "doi": "Dogri (Makrosprache)",
+        "dsb": "Sorbisch; Nieder",
         "dua": "Duala",
-        "dum": "Nederlands; middel (ca. 1050-1350)",
+        "dum": "Niederländisch; Mittel (ca. 1050-1350)",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
-        "efi": "Efikisch",
-        "egy": "Egyptisch (antiek)",
+        "efi": "Efik",
+        "egy": "Ägyptisch (Historisch)",
         "eka": "Ekajuk",
-        "ell": "Grieks; Modern (1453-)",
-        "elx": "Elamitisch",
-        "eng": "Engels",
-        "enm": "Engels; middel (1100-1500)",
+        "ell": "Neugriechisch (ab 1453)",
+        "elx": "Elamisch",
+        "eng": "Englisch",
+        "enm": "Mittelenglisch",
         "epo": "Esperanto",
-        "est": "Estlands",
+        "est": "Estnisch",
         "eus": "Baskisch",
-        "ewe": "Ewe",
+        "ewe": "Ewe-Sprache",
         "ewo": "Ewondo",
-        "fan": "Fang",
-        "fao": "Faeröers",
-        "fas": "Perzisch",
+        "fan": "Fang (Äquatorial-Guinea)",
+        "fao": "Färöisch",
+        "fas": "Persisch",
         "fat": "Fanti",
-        "fij": "Fijisch",
-        "fil": "Filipijns",
-        "fin": "Fins",
+        "fij": "Fidschianisch",
+        "fil": "Filipino",
+        "fin": "Finnisch",
         "fon": "Fon",
-        "fra": "Frans",
-        "frm": "Frans; middel (ca. 1400-1600)",
-        "fro": "Frans; oud (842-ca. 1400)",
-        "frr": "Fries; noordelijk (Duitsland)",
-        "frs": "Fries; oostelijk (Duitsland)",
-        "fry": "Fries",
-        "ful": "Fulah",
-        "fur": "Friulisch",
+        "fra": "Französisch",
+        "frm": "Französisch; Mittel (ca. 1400 - 1600)",
+        "fro": "Französisch; Alt (842 - ca. 1400)",
+        "frr": "Friesisch; Nord",
+        "frs": "Friesisch; Ost",
+        "fry": "Friesisch; West",
+        "ful": "Ful",
+        "fur": "Friaulisch",
         "gaa": "Ga",
         "gay": "Gayo",
-        "gba": "Gbaya (Centraal Afrikaanse Republiek)",
-        "gez": "Ge'ez",
-        "gil": "Gilbertees",
-        "gla": "Keltisch; schots",
-        "gle": "Iers",
-        "glg": "Galiciaans",
+        "gba": "Gbaya (Zentralafrikanische Republik)",
+        "gez": "Altäthiopisch",
+        "gil": "Gilbertesisch",
+        "gla": "Gälisch; Schottisch",
+        "gle": "Irisch",
+        "glg": "Galicisch",
         "glv": "Manx",
-        "gmh": "Duits; middel hoog (ca. 1050-1500)",
-        "goh": "Duits; oud hoog (ca. 750-1050)",
+        "gmh": "Mittelhochdeutsch (ca. 1050-1500)",
+        "goh": "Althochdeutsch (ca. 750-1050)",
+        "gon": "Gondi",
+        "gor": "Gorontalesisch",
+        "got": "Gotisch",
+        "grb": "Grebo",
+        "grc": "Altgriechisch (bis 1453)",
+        "grn": "Guaraní",
+        "gsw": "Schweizerdeutsch",
+        "guj": "Gujarati",
+        "gwi": "Kutchin",
+        "hai": "Haida",
+        "hat": "Kreolisch; Haitisch",
+        "hau": "Haussa",
+        "haw": "Hawaiianisch",
+        "heb": "Hebräisch",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "Hindi",
+        "hit": "Hethitisch",
+        "hmn": "Miao-Sprachen",
+        "hmo": "Hiri-Motu",
+        "hrv": "Kroatisch",
+        "hsb": "Obersorbisch",
+        "hun": "Ungarisch",
+        "hup": "Hupa",
+        "hye": "Armenisch",
+        "iba": "Iban",
+        "ibo": "Ibo",
+        "ido": "Ido",
+        "iii": "Yi; Sichuan",
+        "iku": "Inuktitut",
+        "ile": "Interlingue",
+        "ilo": "Ilokano",
+        "ina": "Interlingua (Internationale Hilfssprachen-Vereinigung)",
+        "ind": "Indonesisch",
+        "inh": "Inguschisch",
+        "ipk": "Inupiaq",
+        "isl": "Isländisch",
+        "ita": "Italienisch",
+        "jav": "Javanisch",
+        "jbo": "Lojban",
+        "jpn": "Japanisch",
+        "jpr": "Jüdisch-Persisch",
+        "jrb": "Jüdisch-Arabisch",
+        "kaa": "Karakalpakisch",
+        "kab": "Kabylisch",
+        "kac": "Kachinisch",
+        "kal": "Kalaallisut (Grönländisch)",
+        "kam": "Kamba (Kenia)",
+        "kan": "Kannada",
+        "kas": "Kaschmirisch",
+        "kat": "Georgisch",
+        "kau": "Kanuri",
+        "kaw": "Kawi; Altjavanisch",
+        "kaz": "Kasachisch",
+        "kbd": "Kabardisch",
+        "kha": "Khasi-Sprache",
+        "khm": "Khmer; Zentral",
+        "kho": "Sakisch",
+        "kik": "Kikuyu",
+        "kin": "Rwanda",
+        "kir": "Kirgisisch",
+        "kmb": "Mbundu; Kimbundu",
+        "kok": "Konkani (Makrosprache)",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kor": "Koreanisch",
+        "kos": "Kosraeanisch",
+        "kpe": "Kpelle",
+        "krc": "Karachay-Balkar",
+        "krl": "Karenisch",
+        "kru": "Kurukh",
+        "kua": "Kwanyama",
+        "kum": "Kumükisch",
+        "kur": "Kurdisch",
+        "kut": "Kutenai",
+        "lad": "Judenspanisch",
+        "lah": "Lahnda",
+        "lam": "Banjari; Lamba",
+        "lao": "Laotisch",
+        "lat": "Lateinisch",
+        "lav": "Lettisch",
+        "lez": "Lesgisch",
+        "lim": "Limburgisch",
+        "lin": "Lingala",
+        "lit": "Litauisch",
+        "lol": "Mongo",
+        "loz": "Rotse",
+        "ltz": "Luxemburgisch",
+        "lua": "Luba-Lulua",
+        "lub": "Luba-Katanga",
+        "lug": "Ganda",
+        "lui": "Luiseno",
+        "lun": "Lunda",
+        "luo": "Luo (Kenia und Tansania)",
+        "lus": "Lushai",
+        "mad": "Maduresisch",
+        "mag": "Khotta",
+        "mah": "Marshallesisch",
+        "mai": "Maithili",
+        "mak": "Makassarisch",
+        "mal": "Malayalam",
+        "man": "Mande; Mandigo; Malinke",
+        "mar": "Marathi",
+        "mas": "Massai",
+        "mdf": "Moksha",
+        "mdr": "Mandaresisch",
+        "men": "Mende (Sierra Leone)",
+        "mga": "Mittelirisch (900-1200)",
+        "mic": "Mikmak",
+        "min": "Minangkabau",
+        "mis": "Nichtklassifizierte Sprachen",
+        "mkd": "Makedonisch",
+        "mlg": "Madegassisch",
+        "mlt": "Maltesisch",
+        "mnc": "Manchu; Mandschurisch",
+        "mni": "Meithei-Sprache",
+        "moh": "Mohawk",
+        "mon": "Mongolisch",
+        "mos": "Mossi",
+        "mri": "Maori",
+        "msa": "Malaiisch (Makrosprache)",
+        "mul": "Mehrsprachig; Polyglott",
+        "mus": "Muskogee",
+        "mwl": "Mirandesisch",
+        "mwr": "Marwari",
+        "mya": "Burmesisch",
+        "myv": "Erzya",
+        "nap": "Neapolitanisch",
+        "nau": "Nauruanisch",
+        "nav": "Navajo",
+        "nbl": "Ndebele (Süd)",
+        "nde": "Ndebele (Nord)",
+        "ndo": "Ndonga",
+        "nds": "Plattdeutsch",
+        "nep": "Nepali",
+        "new": "Bhasa; Nepalesisch",
+        "nia": "Nias",
+        "niu": "Niue",
+        "nld": "Niederländisch",
+        "nno": "Nynorsk (Norwegen)",
+        "nob": "Norwegisch-Bokmål",
+        "nog": "Nogai",
+        "non": "Altnordisch",
+        "nor": "Norwegisch",
+        "nqo": "N'Ko",
+        "nso": "Sotho; Nord",
+        "nwc": "Newari; Alt",
+        "nya": "Nyanja",
+        "nym": "Nyamwezi",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Okzitanisch (nach 1500)",
+        "oji": "Ojibwa",
+        "ori": "Orija",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Ossetisch",
+        "ota": "Ottomanisch (Osmanisch/Türkisch) (1500-1928)",
+        "pag": "Pangasinan",
+        "pal": "Mittelpersisch",
+        "pam": "Pampanggan",
+        "pan": "Panjabi",
+        "pap": "Papiamento",
+        "pau": "Palau",
+        "peo": "Persisch; Alt (ca. 600-400 v.Chr.)",
+        "phn": "Phönikisch",
+        "pli": "Pali",
+        "pol": "Polnisch",
+        "pon": "Ponapeanisch",
+        "por": "Portugiesisch",
+        "pro": "Altokzitanisch; Altprovenzalisch (bis 1500)",
+        "pus": "Paschtu; Afghanisch",
+        "que": "Ketschua",
+        "raj": "Rajasthani",
+        "rap": "Osterinsel-Sprache; Rapanui",
+        "rar": "Maori; Cook-Inseln",
+        "roh": "Bündnerromanisch",
+        "rom": "Romani; Zigeunersprache",
+        "ron": "Rumänisch",
+        "run": "Rundi",
+        "rup": "Rumänisch; Mezedonisch",
+        "rus": "Russisch",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "sah": "Jakutisch",
+        "sam": "Aramäisch; Samaritanisch",
+        "san": "Sanskrit",
+        "sas": "Sassak",
+        "sat": "Santali",
+        "scn": "Sizilianisch",
+        "sco": "Schottisch",
+        "sel": "Selkupisch",
+        "sga": "Altirisch (bis 900)",
+        "shn": "Schan",
+        "sid": "Sidamo",
+        "sin": "Singhalesisch",
+        "slk": "Slowakisch",
+        "slv": "Slowenisch",
+        "sma": "Sami; Süd",
+        "sme": "Nordsamisch",
+        "smj": "Samisch (Lule)",
+        "smn": "Samisch; Inari",
+        "smo": "Samoanisch",
+        "sms": "Samisch; Skolt",
+        "sna": "Schona",
+        "snd": "Sindhi",
+        "snk": "Soninke",
+        "sog": "Sogdisch",
+        "som": "Somali",
+        "sot": "Sotho (Süd)",
+        "spa": "Spanisch; Kastilianisch",
+        "sqi": "Albanisch",
+        "srd": "Sardisch",
+        "srn": "Sranan Tongo",
+        "srp": "Serbisch",
+        "srr": "Serer",
+        "ssw": "Swazi",
+        "suk": "Sukuma",
+        "sun": "Sundanesisch",
+        "sus": "Susu",
+        "sux": "Sumerisch",
+        "swa": "Swahili (Makrosprache)",
+        "swe": "Schwedisch",
+        "syc": "Syrisch; Klassisch",
+        "syr": "Syrisch",
+        "tah": "Tahitisch",
+        "tam": "Tamilisch",
+        "tat": "Tatarisch",
+        "tel": "Telugu",
+        "tem": "Temne",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tgk": "Tadschikisch",
+        "tgl": "Tagalog",
+        "tha": "Thailändisch",
+        "tig": "Tigre",
+        "tir": "Tigrinja",
+        "tiv": "Tiv",
+        "tkl": "Tokelauanisch",
+        "tlh": "Klingonisch",
+        "tli": "Tlingit",
+        "tmh": "Tamaseq",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga-Inseln)",
+        "tpi": "Neumelanesisch; Pidgin",
+        "tsi": "Tsimshian",
+        "tsn": "Tswana",
+        "tso": "Tsonga",
+        "tuk": "Turkmenisch",
+        "tum": "Tumbuka",
+        "tur": "Türkisch",
+        "tvl": "Elliceanisch",
+        "twi": "Twi",
+        "tyv": "Tuwinisch",
+        "udm": "Udmurt",
+        "uga": "Ugaritisch",
+        "uig": "Uigurisch",
+        "ukr": "Ukrainisch",
+        "umb": "Mbundu; Umbundu",
+        "und": "Unbestimmbar",
+        "urd": "Urdu",
+        "uzb": "Usbekisch",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Vietnamesisch",
+        "vol": "Volapük",
+        "vot": "Wotisch",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippinen)",
+        "was": "Washo",
+        "wln": "Wallonisch",
+        "wol": "Wolof",
+        "xal": "Kalmükisch",
+        "xho": "Xhosa",
+        "yao": "Yao",
+        "yap": "Yapesisch",
+        "yid": "Jiddisch",
+        "yor": "Joruba",
+        "zap": "Zapotekisch",
+        "zbl": "Bliss-Symbole",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zho": "Chinesisch",
+        "zul": "Zulu",
+        "zun": "Zuni",
+        "zxx": "Kein sprachlicher Inhalt",
+        "zza": "Zaza"
+    },
+    "el": {
+        "abk": "Αμπχαζιανά",
+        "ace": "Ατσενέζικα",
+        "ach": "Ακόλο",
+        "ada": "Αντάνγκμε",
+        "ady": "Αντύγκε",
+        "aar": "Αφάρ",
+        "afh": "Αφριχίλι",
+        "afr": "Αφρικάανς",
+        "ain": "Αϊνού (Ιαπωνία)",
+        "aka": "Ακάν",
+        "akk": "Akkadian",
+        "sqi": "Αλβανικά",
+        "ale": "Aleut",
+        "amh": "Amharic",
+        "anp": "Angika",
+        "ara": "Αραβικά",
+        "arg": "Αραγωνικά ",
+        "arp": "Αραπάχο",
+        "arw": "Arawak",
+        "hye": "Αρμένικα",
+        "asm": "Assamese",
+        "ast": "Asturian",
+        "ava": "Αβαρικά",
+        "ave": "Avestan",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Αζερμπαϊτζιανά",
+        "ban": "Balinese",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "bas": "Basa (Cameroon)",
+        "bak": "Bashkir",
+        "eus": "Βασκικά",
+        "bej": "Beja",
+        "bel": "Λευκωρωσικά",
+        "bem": "Bemba (Zambia)",
+        "ben": "Μπενγκάλι",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "byn": "Bilin",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "zbl": "Blissymbols",
+        "bos": "Βοσνιακά",
+        "bra": "Braj",
+        "bre": "Βρετονικά",
+        "bug": "Buginese",
+        "bul": "Βουλγάρικα",
+        "bua": "Buriat",
+        "mya": "Burmese",
+        "cad": "Caddo",
+        "cat": "Καταλανικά",
+        "ceb": "Cebuano",
+        "chg": "Chagatai",
+        "cha": "Chamorro",
+        "che": "Τσετσενικά",
+        "chr": "Cherokee",
+        "chy": "Cheyenne",
+        "chb": "Chibcha",
+        "zho": "Κινέζικα",
+        "chn": "Chinook jargon",
+        "chp": "Chipewyan",
+        "cho": "Choctaw",
+        "chk": "Chuukese",
+        "chv": "Chuvash",
+        "cop": "Κοπτικά",
+        "cor": "Cornish",
+        "cos": "Κορσικανικά",
+        "cre": "Cree",
+        "mus": "Creek",
+        "hrv": "Κροατικά",
+        "ces": "Τσέχικα",
+        "dak": "Dakota",
+        "dan": "Δανέζικα",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "div": "Dhivehi",
+        "din": "Dinka",
+        "doi": "Dogri (macrolanguage)",
+        "dgr": "Dogrib",
+        "dua": "Duala",
+        "nld": "Ολλανδικά",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efik",
+        "egy": "Αρχαία Αιγυπτιακά",
+        "eka": "Ekajuk",
+        "elx": "Elamite",
+        "eng": "Αγγλικά",
+        "myv": "Erzya",
+        "epo": "Εσπεράντο",
+        "est": "Εσθονικά",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fat": "Fanti",
+        "fao": "Faroese",
+        "fij": "Fijian",
+        "fil": "Filipino",
+        "fin": "Φινλανδικά",
+        "fon": "Fon",
+        "fra": "Γαλλικά",
+        "fur": "Friulian",
+        "ful": "Fulah",
+        "gaa": "Ga",
+        "glg": "Galician",
+        "lug": "Ganda",
+        "gay": "Gayo",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "Geez",
+        "kat": "Γεωργιανά",
+        "deu": "Γερμανικά",
+        "gil": "Gilbertese",
         "gon": "Gondi",
         "gor": "Gorontalo",
-        "got": "Gothisch",
+        "got": "Γοτθικά",
         "grb": "Grebo",
-        "grc": "Grieks; antiek (tot 1453)",
         "grn": "Guarani",
-        "gsw": "Duits; Zwitserland",
         "guj": "Gujarati",
         "gwi": "Gwichʼin",
         "hai": "Haida",
-        "hat": "Creools; Haïtiaans",
         "hau": "Hausa",
-        "haw": "Hawaiiaans",
-        "heb": "Hebreeuws",
+        "haw": "Hawaiian",
+        "heb": "Εβραϊκά",
         "her": "Herero",
-        "hil": "Hiligainoons",
-        "hin": "Hindi",
-        "hit": "Hittitisch",
-        "hmn": "Hmong",
-        "hmo": "Hiri Motu",
-        "hrv": "Kroatisch",
-        "hsb": "Servisch; hoger",
-        "hun": "Hongaars",
-        "hup": "Hupa",
-        "hye": "Armeens",
-        "iba": "Ibaans",
-        "ibo": "Igbo",
-        "ido": "Ido",
-        "iii": "Yi; Sichuan - Nuosu",
-        "iku": "Inuktitut",
-        "ile": "Interlingue",
-        "ilo": "Iloko",
-        "ina": "Interlingua (International Auxiliary Language Association)",
-        "ind": "Indonesisch",
-        "inh": "Ingoesjetisch",
-        "ipk": "Inupiak",
-        "isl": "IJslands",
-        "ita": "Italiaans",
-        "jav": "Javaans",
-        "jbo": "Lojbaans",
-        "jpn": "Japans",
-        "jpr": "Joods-Perzisch",
-        "jrb": "Joods-Arabisch",
-        "kaa": "Kara-Kalpak",
-        "kab": "Kabyle",
-        "kac": "Katsjin",
-        "kal": "Groenlands",
-        "kam": "Kamba (Kenya)",
-        "kan": "Kannada; Kanara; Kanarees",
-        "kas": "Kashmiri",
-        "kat": "Georgisch",
-        "kau": "Kanuri",
-        "kaw": "Kawi",
-        "kaz": "Kazachs",
-        "kbd": "Kabardisch; Tsjerkessisch",
-        "kha": "Khasi",
-        "khm": "Khmer, Cambodjaans",
-        "kho": "Khotanees",
-        "kik": "Kikuyu",
-        "kin": "Kinyarwanda",
-        "kir": "Kirgizisch",
-        "kmb": "Kimbundu",
-        "kok": "Konkani",
-        "kom": "Komi",
-        "kon": "Kikongo",
-        "kor": "Koreaans",
-        "kos": "Kosraeaans",
-        "kpe": "Kpelle",
-        "krc": "Karatsjay-Balkar",
-        "krl": "Karelisch",
-        "kru": "Kurukh",
-        "kua": "Kuanyama",
-        "kum": "Kumyk",
-        "kur": "Koerdisch",
-        "kut": "Kutenaïsch",
-        "lad": "Ladino",
-        "lah": "Lahnda",
-        "lam": "Lamba",
-        "lao": "Laotiaans",
-        "lat": "Latijn",
-        "lav": "Lets",
-        "lez": "Lezghiaans",
-        "lim": "Limburgs",
-        "lin": "Lingala",
-        "lit": "Litouws",
-        "lol": "Mongo",
-        "loz": "Lozi",
-        "ltz": "Luxemburgs",
-        "lua": "Luba-Lulua",
-        "lub": "Luba-Katanga",
-        "lug": "Luganda",
-        "lui": "Luiseno",
-        "lun": "Lunda",
-        "luo": "Luo (Kenia en Tanzania)",
-        "lus": "Lushai",
-        "mad": "Madurees",
-        "mag": "Magahisch",
-        "mah": "Marshallees",
-        "mai": "Maithili",
-        "mak": "Makasar",
-        "mal": "Malayalam",
-        "man": "Mandingo",
-        "mar": "Marathi",
-        "mas": "Masai",
-        "mdf": "Moksja",
-        "mdr": "Mandars",
-        "men": "Mende",
-        "mga": "Iers; middel (900-1200)",
-        "mic": "Mi'kmaq; Micmac",
-        "min": "Minangkabau",
-        "mis": "Niet-gecodeerde talen",
-        "mkd": "Macedonisch",
-        "mlg": "Malagassisch",
-        "mlt": "Maltees",
-        "mnc": "Manchu",
-        "mni": "Manipuri",
-        "moh": "Mohawk",
-        "mon": "Mongools",
-        "mos": "Mossisch",
-        "mri": "Maori",
-        "msa": "Maleis",
-        "mul": "Meerdere talen",
-        "mus": "Creek",
-        "mwl": "Mirandees",
-        "mwr": "Marwari",
-        "mya": "Burmees",
-        "myv": "Erzya",
-        "nap": "Napolitaans",
-        "nau": "Nauruaans",
-        "nav": "Navajo",
-        "nbl": "Ndebele; zuid",
-        "nde": "Ndebele; noord",
-        "ndo": "Ndonga",
-        "nds": "Duits; Laag",
-        "nep": "Nepalees",
-        "new": "Newari; Nepal",
-        "nia": "Nias",
-        "niu": "Niueaans",
-        "nld": "Nederlands",
-        "nno": "Noors; Nynorsk",
-        "nob": "Noors; Bokmål",
-        "nog": "Nogai",
-        "non": "Noors; oud",
-        "nor": "Noors",
-        "nqo": "N'Ko",
-        "nso": "Pedi; Sepedi; Noord-Sothotisch",
-        "nwc": "Newari; Klassiek Nepal",
-        "nya": "Nyanja",
-        "nym": "Nyamwezi",
-        "nyn": "Nyankools",
-        "nyo": "Nyoro",
-        "nzi": "Nzima",
-        "oci": "Occitaans (na 1500)",
-        "oji": "Ojibwa",
-        "ori": "Oriya",
-        "orm": "Oromo",
-        "osa": "Osaags",
-        "oss": "Ossetisch",
-        "ota": "Turks; ottomaans (1500-1928)",
-        "pag": "Pangasinaans",
-        "pal": "Pehlevi",
-        "pam": "Pampanga",
-        "pan": "Punjabi",
-        "pap": "Papiamento",
-        "pau": "Palauaans",
-        "peo": "Perzisch; oud (ca. 600-400 B.C.)",
-        "phn": "Foenisisch",
-        "pli": "Pali",
-        "pol": "Pools",
-        "pon": "Pohnpeiaans",
-        "por": "Portugees",
-        "pro": "Provençaals; oud (tot 1500)",
-        "pus": "Poesjto",
-        "que": "Quechua",
-        "raj": "Rajasthani",
-        "rap": "Rapanui",
-        "rar": "Rarotongan; Cookeilanden Maori",
-        "roh": "Reto-Romaans",
-        "rom": "Romani",
-        "ron": "Roemeens",
-        "run": "Rundi",
-        "rup": "Roemeens; Macedo-",
-        "rus": "Russisch",
-        "sad": "Sandawe",
-        "sag": "Sangho",
-        "sah": "Jakoets",
-        "sam": "Aramees; Samaritaans",
-        "san": "Sanskriet",
-        "sas": "Sasaaks",
-        "sat": "Santali",
-        "scn": "Siciliaans",
-        "sco": "Schots",
-        "sel": "Sulkoeps",
-        "sga": "Iers; oud (tot 900)",
-        "shn": "Sjaans",
-        "sid": "Sidamo",
-        "sin": "Sinhala",
-        "slk": "Slowaaks",
-        "slv": "Sloveens",
-        "sma": "Samisch; zuid, Laps; zuid",
-        "sme": "Samisch; noord, Laps; noord",
-        "smj": "Lule Sami",
-        "smn": "Sami; Inari, Laps; Inari",
-        "smo": "Samoaans",
-        "sms": "Sami; Skolt, Laps; Skolt",
-        "sna": "Shona",
-        "snd": "Sindhi",
-        "snk": "Soninke",
-        "sog": "Sogdiaans",
-        "som": "Somalisch",
-        "sot": "Sothaans; zuidelijk",
-        "spa": "Spaans",
-        "sqi": "Albanees",
-        "srd": "Sardinisch",
-        "srn": "Sranan Tongo",
-        "srp": "Servisch",
-        "srr": "Serer",
-        "ssw": "Swati",
-        "suk": "Sukuma",
-        "sun": "Soendanees; Sundanees",
-        "sus": "Susu",
-        "sux": "Sumerisch",
-        "swa": "Swahili",
-        "swe": "Zweeds",
-        "syc": "Syriac; Klassiek",
-        "syr": "Syrisch",
-        "tah": "Tahitisch",
-        "tam": "Tamil",
-        "tat": "Tataars",
-        "tel": "Telugu",
-        "tem": "Timne",
-        "ter": "Tereno",
-        "tet": "Tetum",
-        "tgk": "Tadzjieks",
-        "tgl": "Tagalog",
-        "tha": "Thai",
-        "tig": "Tigre",
-        "tir": "Tigrinya",
-        "tiv": "Tiv",
-        "tkl": "Tokelau",
-        "tlh": "Klingon; tlhIngan-Hol",
-        "tli": "Tlingit",
-        "tmh": "Tamasjek",
-        "tog": "Tonga (Nyasa)",
-        "ton": "Tonga (Tonga-eilanden)",
-        "tpi": "Tok Pisin",
-        "tsi": "Tsimsjiaans",
-        "tsn": "Tswana",
-        "tso": "Tsonga",
-        "tuk": "Turkmeens",
-        "tum": "Tumbuka",
-        "tur": "Turks",
-        "tvl": "Tuvalu",
-        "twi": "Twi",
-        "tyv": "Tuviniaans",
-        "udm": "Udmurts",
-        "uga": "Ugaritisch",
-        "uig": "Oeigoers; Oejgoers",
-        "ukr": "Oekraïens",
-        "umb": "Umbundu",
-        "und": "Onbepaald",
-        "urd": "Urdu",
-        "uzb": "Oezbeeks",
-        "vai": "Vai",
-        "ven": "Venda",
-        "vie": "Vietnamees",
-        "vol": "Volapük",
-        "vot": "Votisch",
-        "wal": "Walamo",
-        "war": "Waray (Filipijns)",
-        "was": "Wasjo",
-        "wln": "Waals",
-        "wol": "Wolof",
-        "xal": "Kalmyk",
-        "xho": "Xhosa",
-        "yao": "Yao",
-        "yap": "Yapees",
-        "yid": "Jiddisch",
-        "yor": "Yoruba",
-        "zap": "Zapotec",
-        "zbl": "Blissymbolen",
-        "zen": "Zenaga",
-        "zha": "Zhuang, Tsjoeang",
-        "zho": "Chinees",
-        "zul": "Zoeloe",
-        "zun": "Zuni",
-        "zxx": "Geen linguïstische inhoud",
-        "zza": "Zaza"
-    },
-    "tr": {
-        "abk": "Abhazca",
-        "ace": "Achinese",
-        "ach": "Acoli",
-        "ada": "Adangme",
-        "ady": "Adyghe",
-        "aar": "Afar",
-        "afh": "Afrihili",
-        "afr": "Afrikanca",
-        "ain": "Ainu (Japonca)",
-        "aka": "Akanca (Afrika dili)",
-        "akk": "Akatça",
-        "sqi": "Albanian",
-        "ale": "Alaskaca",
-        "amh": "Etiyopyaca",
-        "anp": "Angika",
-        "ara": "Arapça",
-        "arg": "Aragonca (İspanya)",
-        "arp": "Arapaho (Kuzey Amerika yerlileri)",
-        "arw": "Arawak (Surinam)",
-        "hye": "Ermenice",
-        "asm": "Assamese (Hindistan)",
-        "ast": "Asturyasca",
-        "ava": "Avarca",
-        "ave": "Avestan (Eski İran)",
-        "awa": "Awadhi (Hindistan)",
-        "aym": "Aymara (Güney Amerika)",
-        "aze": "Azerice",
-        "ban": "Balice (Bali adaları)",
-        "bal": "Belucice (İran)",
-        "bam": "Bambara (Mali)",
-        "bas": "Basa (Kamerun)",
-        "bak": "Başkırca",
-        "eus": "Baskça",
-        "bej": "Beja (Eritre; Sudan)",
-        "bel": "Beyaz Rusça",
-        "bem": "Bemba (Zambia)",
-        "ben": "Bengalce",
-        "bho": "Bhojpuri (Hindistan)",
-        "bik": "Bikol (Filipinler)",
-        "byn": "Bilin",
-        "bin": "Bini (Afrika)",
-        "bis": "Bislama (Vanuatu; Kuzey Pasifik)",
-        "zbl": "Blis Sembolleri",
-        "bos": "Boşnakça",
-        "bra": "Braj (Hindistan)",
-        "bre": "Bretonca",
-        "bug": "Buginese (Endonezya)",
-        "bul": "Bulgarca",
-        "bua": "Buriat (Moğolistan)",
-        "mya": "Burmaca",
-        "cad": "Caddo (Kuzey Amerika yerlileri)",
-        "cat": "Katalanca",
-        "ceb": "Cebuano (Filipinler)",
-        "chg": "Çağatayca",
-        "cha": "Chamorro (Guam adaları)",
-        "che": "Çeçence",
-        "chr": "Cherokee (Kuzey Amerika yerlileri)",
-        "chy": "Cheyenne (kuzey Amerika yerlileri)",
-        "chb": "Chibcha (Kolombiya)",
-        "zho": "Çince",
-        "chn": "Chinook lehçesi (Kuzey Batı Amerika kıyıları)",
-        "chp": "Chipewyan (Kuzey Amerika yerlileri)",
-        "cho": "Choctaw (Kuzey Amerika yerlileri)",
-        "chk": "Chuukese",
-        "chv": "Çuvaş (Türkçe)",
-        "cop": "Kıptice (Eski Mısır)",
-        "cor": "Cornish (Kelt)",
-        "cos": "Korsikaca",
-        "cre": "Cree (Kuzey Amerika yerlileri)",
-        "mus": "Creek",
-        "hrv": "Hırvatça",
-        "ces": "Çekçe",
-        "dak": "Dakota (Kuzey Amerika yerlileri)",
-        "dan": "Danimarkaca; Danca",
-        "dar": "Dargwa (Dağıstan)",
-        "del": "Delaware (Kuzey Amerika yerlileri)",
-        "div": "Dhivehi",
-        "din": "Dinka (Sudan)",
-        "doi": "Dogri (makro dili)",
-        "dgr": "Dogrib (Kanada)",
-        "dua": "Duala (Afrika)",
-        "nld": "Flâmanca (Hollanda dili)",
-        "dyu": "Dyula (Burkina Faso; Mali)",
-        "dzo": "Dzongkha (Butan)",
-        "efi": "Efik (Afrika)",
-        "egy": "Mısırca (Eski)",
-        "eka": "Ekajuk (Afrika)",
-        "elx": "Elamca",
-        "eng": "İngilizce",
-        "myv": "Erzya dili",
-        "epo": "Esperanto",
-        "est": "Estonca",
-        "ewe": "Ewe (Afrika)",
-        "ewo": "Ewondo (Afrika)",
-        "fan": "Fang (Ekvatoryal Guinea)",
-        "fat": "Fanti (Afrika)",
-        "fao": "Faroece",
-        "fij": "Fiji dili",
-        "fil": "Filipince",
-        "fin": "Fince",
-        "fon": "Fon (Benin)",
-        "fra": "Fransızca",
-        "fur": "Friulian (İtalya)",
-        "ful": "Fulah (Afrika)",
-        "gaa": "Ganaca",
-        "glg": "Galce",
-        "lug": "Ganda Dili",
-        "gay": "Gayo (Sumatra)",
-        "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
-        "gez": "Geez (Etiyopya)",
-        "kat": "Gürcüce",
-        "deu": "Almanca",
-        "gil": "Kiribati dili",
-        "gon": "Gondi (Hindistan)",
-        "gor": "Gorontalo (Endonezya)",
-        "got": "Gotik",
-        "grb": "Grebo (Liberya)",
-        "grn": "Guarani (Paraguay)",
-        "guj": "Gucaratça",
-        "gwi": "Gwichʼin",
-        "hai": "Haida (Kuzey Amerika yerlileri)",
-        "hau": "Hausa Dili",
-        "haw": "Havai Dili",
-        "heb": "İbranice",
-        "her": "Herero Dili",
         "hil": "Hiligaynon",
-        "hin": "Hintçe",
+        "hin": "Ινδικά",
         "hmo": "Hiri Motu",
-        "hit": "Hititçe",
+        "hit": "Hittite",
         "hmn": "Hmong",
-        "hun": "Macarca",
+        "hun": "Ουγγρικά",
         "hup": "Hupa",
         "iba": "Iban",
-        "isl": "İzlandaca",
-        "ido": "Ido Dili",
-        "ibo": "Igbo Dili",
+        "isl": "Ισλανδικά",
+        "ido": "Ido",
+        "ibo": "Igbo",
         "ilo": "Iloko",
-        "ind": "Endonezyaca",
-        "inh": "İnguşca",
-        "ina": "Interlingua (Uluslararası Yardımcı Dil Kurumu)",
+        "ind": "Ινδονησιακά",
+        "inh": "Ingush",
+        "ina": "Interlingua (International Auxiliary Language Association)",
         "ile": "Interlingue",
         "iku": "Inuktitut",
-        "ipk": "Inupiak Dili",
-        "gle": "İrlandaca",
-        "ita": "İtalyanca",
-        "jpn": "Japonca",
-        "jav": "Cava Dili",
-        "jrb": "Yahudi-Arapçası",
-        "jpr": "Yahudi-Farsça",
+        "ipk": "Inupiaq",
+        "gle": "Ιρλανδέζικα",
+        "ita": "Ιταλικά",
+        "jpn": "Γιαπωνέζικα",
+        "jav": "Javanese",
+        "jrb": "Judeo-Arabic",
+        "jpr": "Judeo-Persian",
         "kbd": "Kabardian",
         "kab": "Kabyle",
         "kac": "Kachin",
@@ -1011,222 +1011,1062 @@ LANGUAGE_NAMES = {
         "xal": "Kalmyk",
         "kam": "Kamba (Kenya)",
         "kan": "Kannada",
-        "kau": "Kanuri Dili",
+        "kau": "Kanuri",
         "kaa": "Kara-Kalpak",
         "krc": "Karachay-Balkar",
         "krl": "Karelian",
-        "kas": "Keşmirce",
-        "csb": "Kashubian (Lehçe diyalekti)",
+        "kas": "Kashmiri",
+        "csb": "Kashubian",
         "kaw": "Kawi",
-        "kaz": "Kazakça",
+        "kaz": "Kazakh",
         "kha": "Khasi",
         "kho": "Khotanese",
-        "kik": "Kikuyu Dili",
+        "kik": "Kikuyu",
         "kmb": "Kimbundu",
         "kin": "Kinyarwanda",
-        "kir": "Kırgızca",
-        "tlh": "Klingon",
-        "kom": "Komi Dili",
-        "kon": "Kongo Dili",
-        "kok": "Konkani (makro dil)",
-        "kor": "Korece",
+        "kir": "Kirghiz",
+        "tlh": "Κλίγκον",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kok": "Konkani (macrolanguage)",
+        "kor": "Κορεάτικα",
         "kos": "Kosraean",
         "kpe": "Kpelle",
-        "kua": "Kuanyama Dili",
+        "kua": "Kuanyama",
         "kum": "Kumyk",
-        "kur": "Kürtçe",
+        "kur": "Κουρδικά",
         "kru": "Kurukh",
         "kut": "Kutenai",
         "lad": "Ladino",
         "lah": "Lahnda",
         "lam": "Lamba",
-        "lao": "Laos Dili",
-        "lat": "Latince",
-        "lav": "Letonca",
+        "lao": "Lao",
+        "lat": "Λατινικά",
+        "lav": "Λετονέζικα",
         "lez": "Lezghian",
-        "lim": "Liburg Dili",
-        "lin": "Lingala Dili",
-        "lit": "Litvanyaca",
-        "jbo": "Lojban dili",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "Λιθουανικά",
+        "jbo": "Lojban",
         "loz": "Lozi",
-        "lub": "Luba Katanga Dili",
+        "lub": "Luba-Katanga",
         "lua": "Luba-Lulua",
         "lui": "Luiseno",
         "smj": "Lule Sami",
         "lun": "Lunda",
-        "luo": "Luo (Kenya ve Tanzanya)",
+        "luo": "Luo (Kenya and Tanzania)",
         "lus": "Lushai",
-        "ltz": "Lüksemburg Dili",
-        "mkd": "Makedonca",
+        "ltz": "Luxembourgish",
+        "mkd": "Σλαβομακεδονικά",
         "mad": "Madurese",
         "mag": "Magahi",
-        "mai": "Maithili dili",
+        "mai": "Maithili",
         "mak": "Makasar",
-        "mlg": "Madagaskar Dili",
-        "msa": "Malay (makro dili)",
+        "mlg": "Malagasy",
+        "msa": "Malay (macrolanguage)",
         "mal": "Malayalam",
-        "mlt": "Maltaca",
+        "mlt": "Maltese",
         "mnc": "Manchu",
         "mdr": "Mandar",
         "man": "Mandingo",
-        "mni": "Manipuri dili",
-        "glv": "Manx (Galler)",
-        "mri": "Maori Dili",
+        "mni": "Manipuri",
+        "glv": "Manx",
+        "mri": "Maori",
         "arn": "Mapudungun",
         "mar": "Marathi",
-        "chm": "Mari (Rusya)",
-        "mah": "Marshall Dili",
+        "chm": "Mari (Russia)",
+        "mah": "Marshallese",
         "mwr": "Marwari",
         "mas": "Masai",
         "men": "Mende (Sierra Leone)",
-        "mic": "Mi'kmak",
+        "mic": "Mi'kmaq",
         "min": "Minangkabau",
         "mwl": "Mirandese",
         "moh": "Mohawk",
-        "mdf": "Moşka",
+        "mdf": "Moksha",
         "lol": "Mongo",
-        "mon": "Moğol Dili",
+        "mon": "Μογγολικά",
         "mos": "Mossi",
-        "mul": "Çoklu diller",
+        "mul": "Πολλαπλές γλώσσες",
         "nqo": "N'Ko",
         "nau": "Nauru",
-        "nav": "Navajo Dili",
-        "ndo": "Ndonga Dili",
+        "nav": "Navajo",
+        "ndo": "Ndonga",
         "nap": "Neapolitan",
         "nia": "Nias",
         "niu": "Niuean",
-        "zxx": "Hiçbir dil içeriği yok",
+        "zxx": "Χωρίς γλωσσολογικό περιεχόμενο",
         "nog": "Nogai",
-        "nor": "Norveçce",
-        "nob": "Norveççe Bokmal",
-        "nno": "Norveççe Nynorsk",
+        "nor": "Νορβηγικά",
+        "nob": "Norwegian Bokmål",
+        "nno": "Νορβηγικά Nynorsk",
         "nym": "Nyamwezi",
         "nya": "Nyanja",
         "nyn": "Nyankole",
         "nyo": "Nyoro",
         "nzi": "Nzima",
-        "oci": "Oksitanca (1500 sonrası)",
-        "oji": "Ojibwa Dili",
-        "orm": "Oromo Dili",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "orm": "Oromo",
         "osa": "Osage",
-        "oss": "Osetya Dili",
-        "pal": "Pehlevi",
+        "oss": "Ossetian",
+        "pal": "Pahlavi",
         "pau": "Palauan",
-        "pli": "Pali Dili",
+        "pli": "Pali",
         "pam": "Pampanga",
         "pag": "Pangasinan",
-        "pan": "Pencabi Dili",
+        "pan": "Panjabi",
         "pap": "Papiamento",
-        "fas": "Farsça",
-        "phn": "Fenikçe",
+        "fas": "Περσικά",
+        "phn": "Φοινικικά",
         "pon": "Pohnpeian",
-        "pol": "Polonyaca",
-        "por": "Portekizce",
-        "pus": "Pushto",
+        "pol": "Πολωνέζικα",
+        "por": "Πορτογαλικά",
+        "pus": "Pashto",
         "que": "Quechua",
         "raj": "Rajasthani",
         "rap": "Rapanui",
-        "ron": "Rumence",
-        "roh": "Romanca",
-        "rom": "Çingene Dili",
-        "run": "Kirundi",
-        "rus": "Rusça",
-        "smo": "Samoa Dili",
+        "ron": "Ρουμάνικα",
+        "roh": "Romansh",
+        "rom": "Romany",
+        "run": "Rundi",
+        "rus": "Ρώσικα",
+        "smo": "Samoan",
         "sad": "Sandawe",
-        "sag": "Sangho",
-        "san": "Sanskritçe",
-        "sat": "Santali dili",
-        "srd": "Sardinya",
+        "sag": "Sango",
+        "san": "Σανσκριτικά",
+        "sat": "Santali",
+        "srd": "Sardinian",
         "sas": "Sasak",
-        "sco": "İskoç lehçesi",
+        "sco": "Σκωτσέζικα",
         "sel": "Selkup",
-        "srp": "Sırpça",
+        "srp": "Σερβικά",
         "srr": "Serer",
         "shn": "Shan",
         "sna": "Shona",
-        "scn": "Sicilyalı",
+        "scn": "Sicilian",
         "sid": "Sidamo",
-        "bla": "Siksika (Kuzey Amerika yerlileri)",
+        "bla": "Siksika",
         "snd": "Sindhi",
-        "sin": "Sinhala Dili",
-        "den": "Slave (Athapascan; Kuzey Amerika yerlileri)",
-        "slk": "Slovakça",
-        "slv": "Slovence",
-        "sog": "Sogdian",
-        "som": "Somali Dili",
+        "sin": "Sinhala",
+        "den": "Slave (Athapascan)",
+        "slk": "Σλοβακικά",
+        "slv": "Σλοβενικά",
+        "sog": "Σογδιανά",
+        "som": "Σομαλικά",
         "snk": "Soninke",
-        "spa": "İspanyolca",
+        "spa": "Ισπανικά",
         "srn": "Sranan Tongo",
         "suk": "Sukuma",
-        "sux": "Sümerce",
-        "sun": "Sudan Dili",
+        "sux": "Sumerian",
+        "sun": "Sundanese",
         "sus": "Susu",
-        "swa": "Swahili (makro dil)",
-        "ssw": "Siswati",
-        "swe": "İsveçce",
-        "syr": "Süryanice",
+        "swa": "Swahili (macrolanguage)",
+        "ssw": "Swati",
+        "swe": "Σουηδικά",
+        "syr": "Συριακά",
         "tgl": "Tagalog",
-        "tah": "Tahitice",
-        "tgk": "Tacikçe",
+        "tah": "Tahitian",
+        "tgk": "Tajik",
         "tmh": "Tamashek",
-        "tam": "Tamilce",
-        "tat": "Tatarca",
+        "tam": "Ταμίλ",
+        "tat": "Tatar",
         "tel": "Telugu",
         "ter": "Tereno",
         "tet": "Tetum",
-        "tha": "Taylandça",
-        "bod": "Tibetçe",
+        "tha": "Ταϊλανδέζικη",
+        "bod": "Θιβετιανά",
         "tig": "Tigre",
-        "tir": "Tigrinya Dili",
+        "tir": "Tigrinya",
         "tem": "Timne",
         "tiv": "Tiv",
         "tli": "Tlingit",
         "tpi": "Tok Pisin",
-        "tkl": "Tokelau",
+        "tkl": "Τοκελάου",
         "tog": "Tonga (Nyasa)",
-        "ton": "Tonga",
+        "ton": "Tonga (Tonga Islands)",
         "tsi": "Tsimshian",
         "tso": "Tsonga",
-        "tsn": "Setswana",
+        "tsn": "Tswana",
         "tum": "Tumbuka",
-        "tur": "Türkçe",
-        "tuk": "Türkmence",
+        "tur": "Τουρκικά",
+        "tuk": "Τουρκμένικα",
         "tvl": "Tuvalu",
         "tyv": "Tuvinian",
         "twi": "Twi",
         "udm": "Udmurt",
-        "uga": "Ugarit Çivi Yazısı",
-        "uig": "Uygurca",
-        "ukr": "Ukraynaca",
+        "uga": "Ugaritic",
+        "uig": "Uighur",
+        "ukr": "Ουκρανικά",
         "umb": "Umbundu",
-        "mis": "Şifresiz diller",
-        "und": "Belirlenemeyen",
-        "urd": "Urduca",
-        "uzb": "Özbekçe",
+        "mis": "Uncoded languages",
+        "und": "Απροσδιόριστη",
+        "urd": "Urdu",
+        "uzb": "Uzbek",
         "vai": "Vai",
-        "ven": "Venda Dili",
-        "vie": "Vietnamca",
+        "ven": "Venda",
+        "vie": "Βιετναμέζικα",
         "vol": "Volapük",
         "vot": "Votic",
-        "wln": "Valonca",
-        "war": "Waray (Filipinler)",
-        "was": "Vasho",
-        "cym": "Gal Dili",
+        "wln": "Walloon",
+        "war": "Waray (Philippines)",
+        "was": "Washo",
+        "cym": "Ουαλικά",
         "wal": "Wolaytta",
         "wol": "Wolof",
         "xho": "Xhosa",
         "sah": "Yakut",
         "yao": "Yao",
         "yap": "Yapese",
-        "yid": "Yidiş",
+        "yid": "Yiddish",
         "yor": "Yoruba",
         "zap": "Zapotec",
         "zza": "Zaza",
         "zen": "Zenaga",
-        "zha": "Zuang Dili",
+        "zha": "Zhuang",
         "zul": "Zulu",
         "zun": "Zuni"
     },
+    "es": {
+        "aar": "Afar",
+        "abk": "Abjasio",
+        "ace": "Achenés",
+        "ach": "Acholi",
+        "ada": "Adangme",
+        "ady": "Adigué",
+        "afh": "Afrihili",
+        "afr": "Afrikáans",
+        "ain": "Ainu (Japón)",
+        "aka": "Acano",
+        "akk": "Acadio",
+        "ale": "Aleutiano",
+        "alt": "Altai meridional",
+        "amh": "Amhárico",
+        "ang": "Inglés antiguo (ca. 450-1100)",
+        "anp": "Angika",
+        "ara": "Árabe",
+        "arc": "Arameo oficial (700-300 A. C.)",
+        "arg": "Aragonés",
+        "arn": "Mapudungun",
+        "arp": "Arapajó",
+        "arw": "Arahuaco",
+        "asm": "Asamés",
+        "ast": "Asturiano",
+        "ava": "Ávaro",
+        "ave": "Avéstico",
+        "awa": "Awadhi",
+        "aym": "Aimara",
+        "aze": "Azerí",
+        "bak": "Bashkir",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "ban": "Balinés",
+        "bas": "Basa (Camerún)",
+        "bej": "Beya",
+        "bel": "Bielorruso",
+        "bem": "Bemba (Zambia)",
+        "ben": "Bengalí",
+        "bho": "Bopurí",
+        "bik": "Bicolano",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "bla": "Siksiká",
+        "bod": "Tibetano",
+        "bos": "Bosnio",
+        "bra": "Braj",
+        "bre": "Bretón",
+        "bua": "Buriato",
+        "bug": "Buginés",
+        "bul": "Búlgaro",
+        "byn": "Bilin",
+        "cad": "Caddo",
+        "car": "Caribe galibí",
+        "cat": "Catalán",
+        "ceb": "Cebuano",
+        "ces": "Checo",
+        "cha": "Chamorro",
+        "chb": "Muisca",
+        "che": "Checheno",
+        "chg": "Chagatai",
+        "chk": "Chuukés",
+        "chm": "Mari (Rusia)",
+        "chn": "Jerga chinook",
+        "cho": "Choctaw",
+        "chp": "Chipewyan",
+        "chr": "Cheroqui",
+        "chu": "Eslavo antiguo",
+        "chv": "Chuvasio",
+        "chy": "Cheyenne",
+        "cop": "Copto",
+        "cor": "Córnico",
+        "cos": "Corso",
+        "cre": "Cree",
+        "crh": "Tártaro de Crimea",
+        "csb": "Casubio",
+        "cym": "Galés",
+        "dak": "Dakota",
+        "dan": "Danés",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "den": "Slave (atabascano)",
+        "deu": "Alemán",
+        "dgr": "Dogrib",
+        "din": "Dinka",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolengua)",
+        "dsb": "Bajo sorabo",
+        "dua": "Duala",
+        "dum": "Neerlandés medio (ca. 1050-1350)",
+        "dyu": "Diula",
+        "dzo": "Dzongkha",
+        "efi": "Efik",
+        "egy": "Egipcio (antiguo)",
+        "eka": "Ekajuk",
+        "ell": "Griego moderno (1453-)",
+        "elx": "Elamita",
+        "eng": "Inglés",
+        "enm": "Inglés medio (1100-1500)",
+        "epo": "Esperanto",
+        "est": "Estonio",
+        "eus": "Vasco",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Guinea Ecuatorial)",
+        "fao": "Feroés",
+        "fas": "Persa",
+        "fat": "Fanti",
+        "fij": "Fiyiano",
+        "fil": "Filipino",
+        "fin": "Finés",
+        "fon": "Fon",
+        "fra": "Francés",
+        "frm": "Francés medio (ca. 1400-1600)",
+        "fro": "Francés antiguo (842-ca. 1400)",
+        "frr": "Frisón septentrional",
+        "frs": "Frisón oriental",
+        "fry": "Frisón occidental",
+        "ful": "Fula",
+        "fur": "Friulano",
+        "gaa": "Ga",
+        "gay": "Gayo",
+        "gba": "Gbaya (República Centroafricana)",
+        "gez": "Ge'ez",
+        "gil": "Gilbertés",
+        "gla": "Gaélico escocés",
+        "gle": "Irlandés",
+        "glg": "Gallego",
+        "glv": "Manés",
+        "gmh": "Alto alemán medio (ca. 1050-1500)",
+        "goh": "Alto alemán antiguo (ca. 750-1050)",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "Gótico",
+        "grb": "Grebo",
+        "grc": "Griego antiguo (hasta 1453)",
+        "grn": "Guaraní",
+        "gsw": "Alemán suizo",
+        "guj": "Guyaratí",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hat": "Criollo haitiano",
+        "hau": "Hausa",
+        "haw": "Hawaiano",
+        "heb": "Hebreo",
+        "her": "Herero",
+        "hil": "Hiligainón",
+        "hin": "Hindi",
+        "hit": "Hitita",
+        "hmn": "Hmong",
+        "hmo": "Hiri motu",
+        "hrv": "Croata",
+        "hsb": "Alto sorabo",
+        "hun": "Húngaro",
+        "hup": "Hupa",
+        "hye": "Armenio",
+        "iba": "Iban",
+        "ibo": "Igbo",
+        "ido": "Ido",
+        "iii": "Yi de Sichuan",
+        "iku": "Inuktitut",
+        "ile": "Interlingüe",
+        "ilo": "Ilocano",
+        "ina": "Interlingua",
+        "ind": "Indonesio",
+        "inh": "Ingusetio",
+        "ipk": "Iñupiaq",
+        "isl": "Islandés",
+        "ita": "Italiano",
+        "jav": "Javanés",
+        "jbo": "Lojban",
+        "jpn": "Japonés",
+        "jpr": "Judeo-persa",
+        "jrb": "Judeo-árabe",
+        "kaa": "Karakalpako",
+        "kab": "Cabilio",
+        "kac": "Kachin",
+        "kal": "Kalaallisut",
+        "kam": "Kamba (Kenia)",
+        "kan": "Canarés",
+        "kas": "Cachemir",
+        "kat": "Georgiano",
+        "kau": "Kanuri",
+        "kaw": "Kawi",
+        "kaz": "Kazajo",
+        "kbd": "Cabardiano",
+        "kha": "Khasi",
+        "khm": "Jemer central",
+        "kho": "Khotanés",
+        "kik": "Kikuyu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirguís",
+        "kmb": "Kimbundu",
+        "kok": "Konkaní (macrolengua)",
+        "kom": "Komi",
+        "kon": "Kikongo",
+        "kor": "Coreano",
+        "kos": "Kosraeano",
+        "kpe": "Kpelle",
+        "krc": "Karachayo-bálkaro",
+        "krl": "Carelio",
+        "kru": "Kurukh",
+        "kua": "Kuanyama",
+        "kum": "Cumuco",
+        "kur": "Curdo",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "Laosiano",
+        "lat": "Latín",
+        "lav": "Letón",
+        "lez": "Lezguino",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "Lituano",
+        "lol": "Mongo",
+        "loz": "Lozi",
+        "ltz": "Luxemburgués",
+        "lua": "Chiluba",
+        "lub": "Kiluba",
+        "lug": "Luganda",
+        "lui": "Luiseño",
+        "lun": "Lunda",
+        "luo": "Luo (Kenia y Tanzania)",
+        "lus": "Mizo",
+        "mad": "Madurés",
+        "mag": "Magahi",
+        "mah": "Marshalés",
+        "mai": "Maithili",
+        "mak": "Macasar",
+        "mal": "Malayalam",
+        "man": "Mandingo",
+        "mar": "Maratí",
+        "mas": "Masai",
+        "mdf": "Moksha",
+        "mdr": "Mandar",
+        "men": "Mende (Sierra Leona)",
+        "mga": "Irlandés medio (900-1200)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mis": "Idiomas sin codificar",
+        "mkd": "Macedonio",
+        "mlg": "Malgache",
+        "mlt": "Maltés",
+        "mnc": "Manchú",
+        "mni": "Meitei",
+        "moh": "Mohawk",
+        "mon": "Mongol",
+        "mos": "Mossi",
+        "mri": "Maorí",
+        "msa": "Malayo (macrolengua)",
+        "mul": "Idiomas múltiples",
+        "mus": "Creek",
+        "mwl": "Mirandés",
+        "mwr": "Marwari",
+        "mya": "Birmano",
+        "myv": "Erzya",
+        "nap": "Napolitano",
+        "nau": "Nauruano",
+        "nav": "Navajo",
+        "nbl": "Ndebele meridional",
+        "nde": "Ndebele septentrional",
+        "ndo": "Ndonga",
+        "nds": "Bajo alemán",
+        "nep": "Nepalí",
+        "new": "Bhasa; Nepalés",
+        "nia": "Nias",
+        "niu": "Niuano",
+        "nld": "Neerlandés",
+        "nno": "Noruego nynorsk",
+        "nob": "Noruego bokmål",
+        "nog": "Nogayo",
+        "non": "Noruego antiguo",
+        "nor": "Noruego",
+        "nqo": "N'ko",
+        "nso": "Sepedi",
+        "nwc": "Newarí antiguo",
+        "nya": "Nyanja",
+        "nym": "Nyamwezi",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzema",
+        "oci": "Occitano (posterior a 1500)",
+        "oji": "Ojibwa",
+        "ori": "Oriya",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Osetio",
+        "ota": "Turco otomano (1500-1928)",
+        "pag": "Pangasinense",
+        "pal": "Pahlavi",
+        "pam": "Pampango",
+        "pan": "Panyabí",
+        "pap": "Papiamento",
+        "pau": "Palauano",
+        "peo": "Persa antiguo (ca. 600-400 A. C.)",
+        "phn": "Fenicio",
+        "pli": "Pali",
+        "pol": "Polaco",
+        "pon": "Pohnpeiano",
+        "por": "Portugués",
+        "pro": "Provenzal antiguo (hasta 1500)",
+        "pus": "Pastún",
+        "que": "Quechua",
+        "raj": "Rajastaní",
+        "rap": "Rapanui",
+        "rar": "Maorí; Islas Cook",
+        "roh": "Romanche",
+        "rom": "Romaní",
+        "ron": "Rumano",
+        "run": "Kirundi",
+        "rup": "Rumano; Macedo-",
+        "rus": "Ruso",
+        "sad": "Sandavés",
+        "sag": "Sango",
+        "sah": "Yakuto",
+        "sam": "Arameo samaritano",
+        "san": "Sánscrito",
+        "sas": "Sasak",
+        "sat": "Santalí",
+        "scn": "Siciliano",
+        "sco": "Escocés (germánico)",
+        "sel": "Selkup",
+        "sga": "Irlandés antiguo (hasta 900)",
+        "shn": "Shan",
+        "sid": "Sidamo",
+        "sin": "Cingalés",
+        "slk": "Eslovaco",
+        "slv": "Esloveno",
+        "sma": "Sami meridional",
+        "sme": "Sami septentrional",
+        "smj": "Sami de Lule",
+        "smn": "Sami de Inari",
+        "smo": "Samoano",
+        "sms": "Sami de Skolt",
+        "sna": "Shona",
+        "snd": "Sindhi",
+        "snk": "Soninké",
+        "sog": "Sogdiano",
+        "som": "Somalí",
+        "sot": "Sesotho",
+        "spa": "Español",
+        "sqi": "Albanés",
+        "srd": "Sardo",
+        "srn": "Sranan tongo",
+        "srp": "Serbio",
+        "srr": "Serer",
+        "ssw": "Swazi",
+        "suk": "Sukuma",
+        "sun": "Sundanés",
+        "sus": "Susu",
+        "sux": "Sumerio",
+        "swa": "Suajili (macrolengua)",
+        "swe": "Sueco",
+        "syc": "Siríaco clásico",
+        "syr": "Siríaco",
+        "tah": "Tahitiano",
+        "tam": "Tamil",
+        "tat": "Tártaro",
+        "tel": "Telugú",
+        "tem": "Temné",
+        "ter": "Tereno",
+        "tet": "Tetun",
+        "tgk": "Tayiko",
+        "tgl": "Tagalo",
+        "tha": "Tailandés",
+        "tig": "Tigré",
+        "tir": "Tigriña",
+        "tiv": "Tiv",
+        "tkl": "Tokelauano",
+        "tlh": "Klingon",
+        "tli": "Tlingit",
+        "tmh": "Targuí",
+        "tog": "Tonga (Malaui)",
+        "ton": "Tonga (Islas Tonga)",
+        "tpi": "Tok pisin",
+        "tsi": "Tsimshian",
+        "tsn": "Setsuana",
+        "tso": "Tsonga",
+        "tuk": "Turcomano",
+        "tum": "Tumbuka",
+        "tur": "Turco",
+        "tvl": "Tuvaluano",
+        "twi": "Twi",
+        "tyv": "Tuvano",
+        "udm": "Udmurt",
+        "uga": "Ugarítico",
+        "uig": "Uiguro",
+        "ukr": "Ucraniano",
+        "umb": "Umbundu",
+        "und": "Indeterminado",
+        "urd": "Urdu",
+        "uzb": "Uzbeko",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Vietnamita",
+        "vol": "Volapük",
+        "vot": "Vótico",
+        "wal": "Wolaytta",
+        "war": "Waray (Filipinas)",
+        "was": "Washo",
+        "wln": "Valón",
+        "wol": "Wólof",
+        "xal": "Calmuco",
+        "xho": "Xhosa",
+        "yao": "Yao",
+        "yap": "Yapés",
+        "yid": "Yidis",
+        "yor": "Yoruba",
+        "zap": "Zapoteco",
+        "zbl": "Símbolos de Bliss",
+        "zen": "Zenaga",
+        "zha": "Chuang",
+        "zho": "Chino",
+        "zul": "Zulú",
+        "zun": "Zuñi",
+        "zxx": "Sin contenido lingüístico",
+        "zza": "Zaza"
+    },
+    "fi": {
+        "aar": "afar",
+        "abk": "abhaasi",
+        "ace": "aceh",
+        "ach": "atšoli",
+        "ada": "adangme",
+        "ady": "adyge",
+        "afh": "afrihili",
+        "afr": "afrikaans",
+        "ain": "Ainu (Japan)",
+        "aka": "Akan",
+        "akk": "akkadi",
+        "ale": "aleutti",
+        "alt": "Altai; Southern",
+        "amh": "amhara",
+        "ang": "English; Old (ca. 450-1100)",
+        "anp": "angika",
+        "ara": "arabia",
+        "arc": "Aramaic; Official (700-300 BCE)",
+        "arg": "aragonia",
+        "arn": "Mapudungun",
+        "arp": "arapaho",
+        "arw": "arawak",
+        "asm": "asami",
+        "ast": "asturia",
+        "ava": "avaari",
+        "ave": "avestan",
+        "awa": "awadhi",
+        "aym": "Aymara",
+        "aze": "azeri",
+        "bak": "baškiiri",
+        "bal": "belutši",
+        "bam": "Bambara",
+        "ban": "bali",
+        "bas": "Basa (Cameroon)",
+        "bej": "beja",
+        "bel": "valkovenäjä",
+        "bem": "Bemba (Zambia)",
+        "ben": "bengali",
+        "bho": "bhojpuri",
+        "bik": "bikol",
+        "bin": "bini",
+        "bis": "bislama",
+        "bla": "mustajalka (siksika)",
+        "bod": "tiibetti",
+        "bos": "bosnia",
+        "bra": "bradž",
+        "bre": "bretoni",
+        "bua": "burjaatti",
+        "bug": "bugi",
+        "bul": "bulgaria",
+        "byn": "Bilin",
+        "cad": "caddo",
+        "car": "Carib; Galibi",
+        "cat": "katalaani",
+        "ceb": "cebuano",
+        "ces": "tšekki",
+        "cha": "chamorro",
+        "chb": "chibcha",
+        "che": "tšetšeeni",
+        "chg": "Chagatai",
+        "chk": "chuuk",
+        "chm": "mari (Venäjä)",
+        "chn": "chinook-jargon",
+        "cho": "choctaw",
+        "chp": "chipewyan",
+        "chr": "cherokee",
+        "chu": "Slavonic; Old",
+        "chv": "tšuvassi",
+        "chy": "cheyenne",
+        "cop": "kopti",
+        "cor": "korni",
+        "cos": "korsika",
+        "cre": "cree",
+        "crh": "krimintataari",
+        "csb": "kašubi",
+        "cym": "kymri",
+        "dak": "dakota",
+        "dan": "tanska",
+        "dar": "dargva",
+        "del": "delaware",
+        "den": "athapaski-slavi",
+        "deu": "saksa",
+        "dgr": "dogrib",
+        "din": "Dinka",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolanguage)",
+        "dsb": "alasorbi",
+        "dua": "duala",
+        "dum": "Dutch; Middle (ca. 1050-1350)",
+        "dyu": "dyula",
+        "dzo": "dzongkha",
+        "efi": "efik",
+        "egy": "muinaisegypti",
+        "eka": "ekajuk",
+        "ell": "nykykreikka",
+        "elx": "elami",
+        "eng": "englanti",
+        "enm": "keskienglanti",
+        "epo": "esperanto",
+        "est": "viro",
+        "eus": "baski",
+        "ewe": "ewe",
+        "ewo": "ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fao": "fääri",
+        "fas": "persia",
+        "fat": "fanti",
+        "fij": "fidži",
+        "fil": "filipino",
+        "fin": "suomi",
+        "fon": "fon",
+        "fra": "ranska",
+        "frm": "French; Middle (ca. 1400-1600)",
+        "fro": "French; Old (842-ca. 1400)",
+        "frr": "Frisian; Northern",
+        "frs": "Frisian; Eastern",
+        "fry": "Frisian; Western",
+        "ful": "fulani",
+        "fur": "friuli",
+        "gaa": "gã",
+        "gay": "gayo",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "ge'ez",
+        "gil": "kiribati",
+        "gla": "Gaelic; Scottish",
+        "gle": "iiri",
+        "glg": "galicia",
+        "glv": "manksi",
+        "gmh": "German; Middle High (ca. 1050-1500)",
+        "goh": "German; Old High (ca. 750-1050)",
+        "gon": "gondi",
+        "gor": "gorontalo",
+        "got": "gootti",
+        "grb": "grebo",
+        "grc": "muinaiskreikka",
+        "grn": "guarani",
+        "gsw": "German; Swiss",
+        "guj": "gujarati",
+        "gwi": "Gwichʼin",
+        "hai": "haida",
+        "hat": "Creole; Haitian",
+        "hau": "hausa",
+        "haw": "havaiji",
+        "heb": "heprea",
+        "her": "herero",
+        "hil": "hiligaynon",
+        "hin": "hindi",
+        "hit": "heetti",
+        "hmn": "hmong",
+        "hmo": "hiri-motu",
+        "hrv": "kroatia",
+        "hsb": "Sorbian; Upper",
+        "hun": "unkari",
+        "hup": "hupa",
+        "hye": "armenia",
+        "iba": "Iban",
+        "ibo": "igbo",
+        "ido": "ido",
+        "iii": "Yi; Sichuan",
+        "iku": "inuktitut",
+        "ile": "interlingue",
+        "ilo": "iloko",
+        "ina": "interlingua",
+        "ind": "indonesia",
+        "inh": "inguuši",
+        "ipk": "iñupiaq",
+        "isl": "islanti",
+        "ita": "italia",
+        "jav": "jaava",
+        "jbo": "lojban",
+        "jpn": "japani",
+        "jpr": "juutalaispersia",
+        "jrb": "juutalaisarabia",
+        "kaa": "karakalpakki",
+        "kab": "kabyyli",
+        "kac": "kachin",
+        "kal": "grönlanti",
+        "kam": "Kamba (Kenya)",
+        "kan": "kannada",
+        "kas": "kashmiri",
+        "kat": "georgia",
+        "kau": "kanuri",
+        "kaw": "kavi",
+        "kaz": "kazakki",
+        "kbd": "kabardi",
+        "kha": "Khasi",
+        "khm": "Khmer; Central",
+        "kho": "khotani",
+        "kik": "kikuyu",
+        "kin": "ruanda",
+        "kir": "kirgiisi",
+        "kmb": "kimbundu",
+        "kok": "Konkani (macrolanguage)",
+        "kom": "komi",
+        "kon": "Kongo",
+        "kor": "korea",
+        "kos": "kosrae",
+        "kpe": "kpelle",
+        "krc": "karatšai-balkaari",
+        "krl": "karjala",
+        "kru": "kurukh",
+        "kua": "kuanjama",
+        "kum": "kumykki",
+        "kur": "kurdi",
+        "kut": "kutenai",
+        "lad": "ladino",
+        "lah": "lahnda",
+        "lam": "lamba",
+        "lao": "lao",
+        "lat": "latina",
+        "lav": "latvia",
+        "lez": "lezgi",
+        "lim": "Limburgan",
+        "lin": "lingala",
+        "lit": "liettua",
+        "lol": "mongo",
+        "loz": "lozi",
+        "ltz": "Luxemburg",
+        "lua": "luba (Lulua)",
+        "lub": "luba (Katanga)",
+        "lug": "Ganda",
+        "lui": "luiseño",
+        "lun": "lunda",
+        "luo": "luo",
+        "lus": "lushai",
+        "mad": "madura",
+        "mag": "magahi",
+        "mah": "Marshallese",
+        "mai": "maithili",
+        "mak": "Makasar",
+        "mal": "malayalam",
+        "man": "mandingo",
+        "mar": "marathi",
+        "mas": "masai",
+        "mdf": "mokša",
+        "mdr": "mandar",
+        "men": "Mende (Sierra Leone)",
+        "mga": "keski-iiri",
+        "mic": "Mi'kmaq",
+        "min": "minangkabau",
+        "mis": "Uncoded languages",
+        "mkd": "makedonia",
+        "mlg": "malagassi",
+        "mlt": "malta",
+        "mnc": "mantšu",
+        "mni": "manipuri",
+        "moh": "mohawk",
+        "mon": "Mongolian",
+        "mos": "mossi",
+        "mri": "maori",
+        "msa": "Malay (macrolanguage)",
+        "mul": "monia kieliä",
+        "mus": "muskogi",
+        "mwl": "mirandês",
+        "mwr": "marwari",
+        "mya": "burma",
+        "myv": "ersä",
+        "nap": "napoli",
+        "nau": "nauru",
+        "nav": "Navajo",
+        "nbl": "ndebele; eteländebele",
+        "nde": "ndebele; pohjoisndebele",
+        "ndo": "ndonga",
+        "nds": "German; Low",
+        "nep": "nepali",
+        "new": "Bhasa; Nepal",
+        "nia": "nias",
+        "niu": "niue",
+        "nld": "hollanti",
+        "nno": "norja (uusnorja)",
+        "nob": "Norwegian Bokmål",
+        "nog": "nogai",
+        "non": "muinaisnorja",
+        "nor": "norja",
+        "nqo": "N'Ko",
+        "nso": "Sotho; Northern",
+        "nwc": "Newari; Old",
+        "nya": "Nyanja",
+        "nym": "nyamwezi",
+        "nyn": "nyankole",
+        "nyo": "Nyoro",
+        "nzi": "nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "ori": "oriya",
+        "orm": "oromo",
+        "osa": "osage",
+        "oss": "Ossetian",
+        "ota": "osmaninturkki",
+        "pag": "pangasinan",
+        "pal": "pahlavi",
+        "pam": "pampanga",
+        "pan": "Panjabi",
+        "pap": "papiamentu",
+        "pau": "palau",
+        "peo": "Persian; Old (ca. 600-400 B.C.)",
+        "phn": "foinikia",
+        "pli": "Pali",
+        "pol": "puola",
+        "pon": "pohnpei",
+        "por": "portugali",
+        "pro": "muinaisprovensaali",
+        "pus": "pašto",
+        "que": "Quechua",
+        "raj": "rajasthani",
+        "rap": "rapanui",
+        "rar": "Maori; Cook Islands",
+        "roh": "Romansh",
+        "rom": "romani",
+        "ron": "romania",
+        "run": "rundi",
+        "rup": "Romanian; Macedo-",
+        "rus": "venäjä",
+        "sad": "sandawe",
+        "sag": "Sango",
+        "sah": "jakuutti",
+        "sam": "Aramaic; Samaritan",
+        "san": "sanskrit",
+        "sas": "Sasak",
+        "sat": "santali",
+        "scn": "sisilia",
+        "sco": "skotti",
+        "sel": "selkuppi",
+        "sga": "muinaisiiri",
+        "shn": "shan",
+        "sid": "sidamo",
+        "sin": "Sinhala",
+        "slk": "slovakki",
+        "slv": "sloveeni",
+        "sma": "eteläsaame",
+        "sme": "pohjoissaame",
+        "smj": "luulajansaame",
+        "smn": "inarinsaame",
+        "smo": "samoa",
+        "sms": "koltansaami",
+        "sna": "shona",
+        "snd": "sindhi",
+        "snk": "soninke",
+        "sog": "sogdi",
+        "som": "somali",
+        "sot": "eteläsotho",
+        "spa": "espanja",
+        "sqi": "albania",
+        "srd": "sardi",
+        "srn": "Sranan Tongo",
+        "srp": "serbia",
+        "srr": "Serer",
+        "ssw": "swazi",
+        "suk": "sukuma",
+        "sun": "sunda",
+        "sus": "susu",
+        "sux": "sumeri",
+        "swa": "Swahili (macrolanguage)",
+        "swe": "ruotsi",
+        "syc": "Syriac; Classical",
+        "syr": "syyria",
+        "tah": "tahiti",
+        "tam": "tamili",
+        "tat": "tataari",
+        "tel": "Telugu",
+        "tem": "temne",
+        "ter": "tereno",
+        "tet": "tetum",
+        "tgk": "tadžikki",
+        "tgl": "tagalog",
+        "tha": "thai",
+        "tig": "tigre",
+        "tir": "tigrinya",
+        "tiv": "tiv",
+        "tkl": "tokelau",
+        "tlh": "Klingon",
+        "tli": "tlinglit",
+        "tmh": "Tamashek",
+        "tog": "Malawin tonga",
+        "ton": "Tongan tonga",
+        "tpi": "tok-pisin",
+        "tsi": "tsimshian",
+        "tsn": "tswana",
+        "tso": "tsonga",
+        "tuk": "turkmeeni",
+        "tum": "tumbuka",
+        "tur": "turkki",
+        "tvl": "tuvalu",
+        "twi": "twi",
+        "tyv": "tuva",
+        "udm": "udmurtti",
+        "uga": "ugarit",
+        "uig": "uiguuri",
+        "ukr": "ukraina",
+        "umb": "umbundu",
+        "und": "määrittämätön",
+        "urd": "urdu",
+        "uzb": "uzbekki",
+        "vai": "vai",
+        "ven": "venda",
+        "vie": "vietnam",
+        "vol": "volapük",
+        "vot": "vatja",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippines)",
+        "was": "washo",
+        "wln": "valloni",
+        "wol": "wolof",
+        "xal": "Kalmyk",
+        "xho": "xhosa",
+        "yao": "mien",
+        "yap": "yap",
+        "yid": "jiddiš",
+        "yor": "yoruba",
+        "zap": "Zapotec",
+        "zbl": "Blissymbols",
+        "zen": "zenaga",
+        "zha": "Zhuang",
+        "zho": "kiina",
+        "zul": "zulu",
+        "zun": "zuni",
+        "zxx": "No linguistic content",
+        "zza": "Zaza"
+    },
     "fr": {
         "aar": "afar",
         "abk": "abkhaze",
@@ -2067,1266 +2907,6 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
-    "ru": {
-        "aar": "Афар",
-        "abk": "Абхазский",
-        "ace": "Ачехский",
-        "ach": "Ачоли",
-        "ada": "Адангме",
-        "ady": "Адыгейский",
-        "afh": "Африхили",
-        "afr": "Африкаанс",
-        "ain": "Ainu (Japan)",
-        "aka": "Акан",
-        "akk": "Аккадский",
-        "ale": "Алеутский",
-        "alt": "Altai; Southern",
-        "amh": "Амхарский (Амаринья)",
-        "ang": "English; Old (ca. 450-1100)",
-        "anp": "Анжика",
-        "ara": "Арабский",
-        "arc": "Арамейский; Официальный",
-        "arg": "Арагонский",
-        "arn": "Mapudungun",
-        "arp": "Арапахо",
-        "arw": "Аравакский",
-        "asm": "Ассамский",
-        "ast": "Астурийский",
-        "ava": "Аварский",
-        "ave": "Авестийский",
-        "awa": "Авадхи",
-        "aym": "Аймара",
-        "aze": "Азербайджанский",
-        "bak": "Башкирский",
-        "bal": "Baluchi",
-        "bam": "Бамбара",
-        "ban": "Балийский",
-        "bas": "Баса (Камерун)",
-        "bej": "Беджа",
-        "bel": "Белорусский",
-        "bem": "Бемба (Замбия)",
-        "ben": "Бенгальский",
-        "bho": "Бходжпури",
-        "bik": "Бикольский",
-        "bin": "Бини",
-        "bis": "Бислама",
-        "bla": "Сиксика",
-        "bod": "Тибетский",
-        "bos": "Боснийский",
-        "bra": "Браун",
-        "bre": "Бретонский",
-        "bua": "Бурятский",
-        "bug": "Бугийский",
-        "bul": "Болгарский",
-        "byn": "Bilin",
-        "cad": "Каддо",
-        "car": "Carib; Galibi",
-        "cat": "Каталанский",
-        "ceb": "Себуано",
-        "ces": "Чешский",
-        "cha": "Чаморро",
-        "chb": "Чибча",
-        "che": "Чеченский",
-        "chg": "Чагатайский",
-        "chk": "Трукский",
-        "chm": "Марийский (Россия)",
-        "chn": "Чинук жаргон",
-        "cho": "Чоктав",
-        "chp": "Чипевианский",
-        "chr": "Чероки",
-        "chu": "Slavonic; Old",
-        "chv": "Чувашский",
-        "chy": "Чейенн",
-        "cop": "Коптский",
-        "cor": "Корнский",
-        "cos": "Корсиканский",
-        "cre": "Кри",
-        "crh": "Turkish; Crimean",
-        "csb": "Кашубианский",
-        "cym": "Уэльский (Валлийский)",
-        "dak": "Дакота",
-        "dan": "Датский",
-        "dar": "Даргва",
-        "del": "Делаварский",
-        "den": "Атапачские языки",
-        "deu": "Немецкий",
-        "dgr": "Догриб",
-        "din": "Динка",
-        "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "Sorbian; Lower",
-        "dua": "Дуала",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "Диула (Дьюла)",
-        "dzo": "Дзонг-кэ",
-        "efi": "Эфик",
-        "egy": "Древнеегипетский",
-        "eka": "Экаджук",
-        "ell": "Новогреческий (с 1453)",
-        "elx": "Эламский",
-        "eng": "Английский",
-        "enm": "Среднеанглийский (1100-1500)",
-        "epo": "Эсперанто",
-        "est": "Эстонский",
-        "eus": "Баскский",
-        "ewe": "Эве",
-        "ewo": "Эвондо",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "Фарерский",
-        "fas": "Персидский",
-        "fat": "Фанти",
-        "fij": "Фиджийский",
-        "fil": "Filipino",
-        "fin": "Финский",
-        "fon": "Фон",
-        "fra": "Французский",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "Фулах",
-        "fur": "Фриулианский",
-        "gaa": "Га",
-        "gay": "Гайо",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "Геэз",
-        "gil": "Гильбертский",
-        "gla": "Gaelic; Scottish",
-        "gle": "Ирландский",
-        "glg": "Galician",
-        "glv": "Мэнкский",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "Гонди",
-        "gor": "Горонтало",
-        "got": "Готский",
-        "grb": "Гребо",
-        "grc": "Древнегреческий (по 1453)",
-        "grn": "Гуарани",
-        "gsw": "German; Swiss",
-        "guj": "Гуджарати",
-        "gwi": "Gwichʼin",
-        "hai": "Хайда",
-        "hat": "Creole; Haitian",
-        "hau": "Хауса",
-        "haw": "Гавайский",
-        "heb": "Иврит",
-        "her": "Гереро",
-        "hil": "Хилигайнон",
-        "hin": "Хинди",
-        "hit": "Хиттит",
-        "hmn": "Хмонг",
-        "hmo": "Хири Моту",
-        "hrv": "Хорватский",
-        "hsb": "Sorbian; Upper",
-        "hun": "Венгерский",
-        "hup": "Хупа",
-        "hye": "Армянский",
-        "iba": "Ибанский",
-        "ibo": "Игбо",
-        "ido": "Идо",
-        "iii": "Yi; Sichuan",
-        "iku": "Инуктитут",
-        "ile": "Интерлингве",
-        "ilo": "Илоко",
-        "ina": "Интерлингва (Ассоциация международного вспомогательного языка)",
-        "ind": "Индонезийский",
-        "inh": "Ингушский",
-        "ipk": "Инулиак",
-        "isl": "Исландский",
-        "ita": "Итальянский",
-        "jav": "Яванский",
-        "jbo": "Лоджбан",
-        "jpn": "Японский",
-        "jpr": "Еврейско-персидский",
-        "jrb": "Еврейско-арабский",
-        "kaa": "Каракалпакский",
-        "kab": "Кабильский",
-        "kac": "Качинский",
-        "kal": "Kalaallisut",
-        "kam": "Kamba (Kenya)",
-        "kan": "Каннада",
-        "kas": "Кашмири",
-        "kat": "Грузинский",
-        "kau": "Канури",
-        "kaw": "Кави",
-        "kaz": "Казахский",
-        "kbd": "Кабардинский",
-        "kha": "Кхаси",
-        "khm": "Khmer; Central",
-        "kho": "Хотанский",
-        "kik": "Кикуйю",
-        "kin": "Киньяруанда",
-        "kir": "Киргизский",
-        "kmb": "Кимбунду",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "Коми",
-        "kon": "Конго",
-        "kor": "Корейский",
-        "kos": "Косраинский",
-        "kpe": "Кпелле",
-        "krc": "Карачаево-балкарский",
-        "krl": "Карельский",
-        "kru": "Курух",
-        "kua": "Киньяма",
-        "kum": "Кумыкский",
-        "kur": "Курдский",
-        "kut": "Кутенаи",
-        "lad": "Ладино",
-        "lah": "Лахнда",
-        "lam": "Ламба",
-        "lao": "Лаосский",
-        "lat": "Латинский",
-        "lav": "Латвийский",
-        "lez": "Лезгинский",
-        "lim": "Limburgan",
-        "lin": "Лингала",
-        "lit": "Литовский",
-        "lol": "Монго",
-        "loz": "Лози",
-        "ltz": "Luxembourgish",
-        "lua": "Луба-Лулуа",
-        "lub": "Луба-Катанга",
-        "lug": "Ганда",
-        "lui": "Луисеньо",
-        "lun": "Лунда",
-        "luo": "Луо (Кения и Танзания)",
-        "lus": "Лушай",
-        "mad": "Мадурский",
-        "mag": "Магахи",
-        "mah": "Marshallese",
-        "mai": "Майтхили",
-        "mak": "Макассарский",
-        "mal": "Малаялам",
-        "man": "Мандинго",
-        "mar": "Маратхи",
-        "mas": "Масаи",
-        "mdf": "Мокшанский",
-        "mdr": "Мандарский",
-        "men": "Mende (Sierra Leone)",
-        "mga": "Среднеирландский (900-1200)",
-        "mic": "Mi'kmaq",
-        "min": "Минангкабау",
-        "mis": "Uncoded languages",
-        "mkd": "Македонский",
-        "mlg": "Малагаси",
-        "mlt": "Мальтийский",
-        "mnc": "Манчу",
-        "mni": "Манипури",
-        "moh": "Мохаук",
-        "mon": "Монгольский",
-        "mos": "Моей",
-        "mri": "Маори",
-        "msa": "Malay (macrolanguage)",
-        "mul": "Разных семей языки",
-        "mus": "Крик",
-        "mwl": "Мирандские",
-        "mwr": "Марвари",
-        "mya": "Бирманский",
-        "myv": "Эрзянский",
-        "nap": "Неаполитанский",
-        "nau": "Науру",
-        "nav": "Navajo",
-        "nbl": "Ндебеле южный",
-        "nde": "Ндебеле северный",
-        "ndo": "Ндунга",
-        "nds": "German; Low",
-        "nep": "Непальский",
-        "new": "Bhasa; Nepal",
-        "nia": "Ниас",
-        "niu": "Ниуэ",
-        "nld": "Нидерландский",
-        "nno": "Норвежский Нюнорск",
-        "nob": "Norwegian Bokmål",
-        "nog": "Ногайский",
-        "non": "Старонорвежский",
-        "nor": "Норвежский",
-        "nqo": "Н'ко",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
-        "nym": "Ньямвези",
-        "nyn": "Ньянколе",
-        "nyo": "Ньоро",
-        "nzi": "Нзима",
-        "oci": "Occitan (post 1500)",
-        "oji": "Оджибва",
-        "ori": "Ория",
-        "orm": "Оромо",
-        "osa": "Оседжи",
-        "oss": "Ossetian",
-        "ota": "Турецкий; Отомангский (1500-1928)",
-        "pag": "Пангасинан",
-        "pal": "Пехлевийский",
-        "pam": "Пампанга",
-        "pan": "Panjabi",
-        "pap": "Папьяменто",
-        "pau": "Палау",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "Финикийский",
-        "pli": "Пали",
-        "pol": "Польский",
-        "pon": "Фонпейский",
-        "por": "Португальский",
-        "pro": "Старопровансальский (по 1500)",
-        "pus": "Пушту",
-        "que": "Кечуа",
-        "raj": "Раджастхани",
-        "rap": "Рапаню",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "Цыганский",
-        "ron": "Румынский",
-        "run": "Рунди",
-        "rup": "Romanian; Macedo-",
-        "rus": "Русский",
-        "sad": "Сандаве",
-        "sag": "Санго",
-        "sah": "Якутский",
-        "sam": "Aramaic; Samaritan",
-        "san": "Санскрит",
-        "sas": "Сасакский",
-        "sat": "Сантали",
-        "scn": "Сицилийский",
-        "sco": "Шотландский",
-        "sel": "Селкапский",
-        "sga": "Староирландский (по 900)",
-        "shn": "Шанский",
-        "sid": "Сидама",
-        "sin": "Сингальский",
-        "slk": "Словацкий",
-        "slv": "Словенский",
-        "sma": "Sami; Southern",
-        "sme": "Sami; Northern",
-        "smj": "Люле-саамский",
-        "smn": "Sami; Inari",
-        "smo": "Самоанский",
-        "sms": "Sami; Skolt",
-        "sna": "Шона",
-        "snd": "Синдхи",
-        "snk": "Сонинк",
-        "sog": "Согдийский",
-        "som": "Сомали",
-        "sot": "Сото Южный",
-        "spa": "Испанский",
-        "sqi": "Албанский",
-        "srd": "Сардинский",
-        "srn": "Sranan Tongo",
-        "srp": "Сербский",
-        "srr": "Серер",
-        "ssw": "Свати",
-        "suk": "Сукума",
-        "sun": "Сунданский",
-        "sus": "Сусу",
-        "sux": "Шумерский",
-        "swa": "Swahili (macrolanguage)",
-        "swe": "Шведский",
-        "syc": "Syriac; Classical",
-        "syr": "Сирийский",
-        "tah": "Таитянский",
-        "tam": "Тамильский",
-        "tat": "Татарский",
-        "tel": "Телугу",
-        "tem": "Темне",
-        "ter": "Терено",
-        "tet": "Тетумский",
-        "tgk": "Таджикский",
-        "tgl": "Тагалог",
-        "tha": "Таи",
-        "tig": "Тигре",
-        "tir": "Тигринья",
-        "tiv": "Тив",
-        "tkl": "Токелау",
-        "tlh": "Klingon",
-        "tli": "Тлингит",
-        "tmh": "Тамашек",
-        "tog": "Тонга (Ньяса)",
-        "ton": "Тонга (острова Тонга)",
-        "tpi": "Ток Писин",
-        "tsi": "Цимшиан",
-        "tsn": "Тсвана",
-        "tso": "Тсонга",
-        "tuk": "Туркменский",
-        "tum": "Тумбука",
-        "tur": "Турецкий",
-        "tvl": "Тувалу",
-        "twi": "Тви",
-        "tyv": "Тувинский",
-        "udm": "Удмуртский",
-        "uga": "Угаритский",
-        "uig": "Уйгурский",
-        "ukr": "Украинский",
-        "umb": "Умбунду",
-        "und": "Неидентифицированный",
-        "urd": "Урду",
-        "uzb": "Узбекский",
-        "vai": "Ваи",
-        "ven": "Венда",
-        "vie": "Вьетнамский",
-        "vol": "Волапюк",
-        "vot": "Вотик",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "Вашо",
-        "wln": "Валлун",
-        "wol": "Волоф",
-        "xal": "Kalmyk",
-        "xho": "Коса",
-        "yao": "Яо",
-        "yap": "Яапийский",
-        "yid": "Идиш",
-        "yor": "Йоруба",
-        "zap": "Сапотекский",
-        "zbl": "Blissymbols",
-        "zen": "Зенагский",
-        "zha": "Чжуанский",
-        "zho": "Китайский",
-        "zul": "Зулусский",
-        "zun": "Зуньи",
-        "zxx": "Нет языкового содержимого",
-        "zza": "Зазаки"
-    },
-    "zh_Hans_CN": {
-        "aar": "阿法尔语",
-        "abk": "阿布哈兹语",
-        "ace": "亚齐语",
-        "ach": "阿乔利语",
-        "ada": "阿当梅语",
-        "ady": "阿迪格语",
-        "afh": "阿弗里希利语",
-        "afr": "南非荷兰语",
-        "ain": "阿伊努语（日本）",
-        "aka": "阿坎语",
-        "akk": "阿卡德语",
-        "ale": "阿留申语",
-        "alt": "阿尔泰语（南）",
-        "amh": "阿姆哈拉语",
-        "ang": "英语（上古，约 450-1100）",
-        "anp": "安吉卡语",
-        "ara": "阿拉伯语",
-        "arc": "阿拉米语（官方，公元前 700-300）",
-        "arg": "阿拉贡语",
-        "arn": "阿劳坎语",
-        "arp": "阿拉帕霍语",
-        "arw": "阿拉瓦克语",
-        "asm": "阿萨姆语",
-        "ast": "阿斯图里亚斯语",
-        "ava": "阿瓦尔语",
-        "ave": "阿维斯陀语",
-        "awa": "阿瓦德语",
-        "aym": "艾马拉语",
-        "aze": "阿塞拜疆语",
-        "bak": "巴什基尔语",
-        "bal": "俾路支语",
-        "bam": "班巴拉语",
-        "ban": "巴厘语",
-        "bas": "巴萨语（喀麦隆）",
-        "bej": "贝扎语",
-        "bel": "白俄罗斯语",
-        "bem": "本巴语（赞比亚）",
-        "ben": "孟加拉语",
-        "bho": "博杰普尔语",
-        "bik": "比科尔语",
-        "bin": "比尼语",
-        "bis": "比斯拉马语",
-        "bla": "西克西卡语",
-        "bod": "藏语",
-        "bos": "波斯尼亚语",
-        "bra": "布拉吉语",
-        "bre": "布列塔尼语",
-        "bua": "布里亚特语",
-        "bug": "布吉语",
-        "bul": "保加利亚语",
-        "byn": "比林语",
-        "cad": "卡多语",
-        "car": "加勒比语",
-        "cat": "加泰罗尼亚语",
-        "ceb": "宿务语",
-        "ces": "捷克语",
-        "cha": "查莫罗语",
-        "chb": "奇布查语",
-        "che": "车臣语",
-        "chg": "察合台语",
-        "chk": "丘克语",
-        "chm": "马里语（俄罗斯）",
-        "chn": "奇努克混合语",
-        "cho": "乔克托语",
-        "chp": "奇佩维安语",
-        "chr": "切罗基语",
-        "chu": "斯拉夫语（古教会）",
-        "chv": "楚瓦什语",
-        "chy": "夏延语",
-        "cop": "科普特语",
-        "cor": "康沃尔语",
-        "cos": "科西嘉语",
-        "cre": "克里语",
-        "crh": "鞑靼语（克里米亚）",
-        "csb": "卡舒比语",
-        "cym": "威尔士语",
-        "dak": "达科他语",
-        "dan": "丹麦语",
-        "dar": "达尔格瓦语",
-        "del": "特拉华语",
-        "den": "史拉维语（阿沙巴斯甘）",
-        "deu": "德语",
-        "dgr": "多格里布语",
-        "din": "丁卡语",
-        "div": "迪维希语",
-        "doi": "多格拉语",
-        "dsb": "索布语（下）",
-        "dua": "杜亚拉语",
-        "dum": "荷兰语（中古，约 1050-1350）",
-        "dyu": "迪尤拉语",
-        "dzo": "宗喀语",
-        "efi": "埃菲克语",
-        "egy": "埃及语（古）",
-        "eka": "埃克丘克语",
-        "ell": "希腊语（现代，1453-）",
-        "elx": "埃兰语",
-        "eng": "英语",
-        "enm": "英语（中古，1100-1500）",
-        "epo": "世界语",
-        "est": "爱沙尼亚语",
-        "eus": "巴斯克语",
-        "ewe": "埃维语",
-        "ewo": "埃翁多语",
-        "fan": "芳语（赤道几内亚）",
-        "fao": "法罗语",
-        "fas": "波斯语",
-        "fat": "芳蒂语",
-        "fij": "斐济语",
-        "fil": "菲律宾语",
-        "fin": "芬兰语",
-        "fon": "丰语",
-        "fra": "法语",
-        "frm": "法语（中古，约 1400-1600）",
-        "fro": "法语（上古，842-约 1400）",
-        "frr": "弗里西语（北）",
-        "frs": "弗里西亚语（东）",
-        "fry": "弗里西亚语（西）",
-        "ful": "富拉语",
-        "fur": "弗留利语",
-        "gaa": "加语",
-        "gay": "卡约语",
-        "gba": "巴亚语（中非共和国）",
-        "gez": "吉兹语",
-        "gil": "吉尔伯特语",
-        "gla": "盖尔语（苏格兰）",
-        "gle": "爱尔兰语",
-        "glg": "加利西亚语",
-        "glv": "马恩岛语",
-        "gmh": "德语（中古高地，约 1050-1500）",
-        "goh": "德语（上古高地，约 750-1050）",
-        "gon": "贡德语",
-        "gor": "哥伦打洛语",
-        "got": "哥特语",
-        "grb": "格列博语",
-        "grc": "希腊语（古典，直到 1453）",
-        "grn": "瓜拉尼语",
-        "gsw": "德语（瑞士）",
-        "guj": "古吉拉特语",
-        "gwi": "库臣语",
-        "hai": "海达语",
-        "hat": "克里奥尔语（海地）",
-        "hau": "豪萨语",
-        "haw": "夏威夷语",
-        "heb": "希伯来语",
-        "her": "赫雷罗语",
-        "hil": "希利盖农语",
-        "hin": "印地语",
-        "hit": "赫梯语",
-        "hmn": "苗语",
-        "hmo": "希里莫图语",
-        "hrv": "克罗地亚语",
-        "hsb": "索布语（上）",
-        "hun": "匈牙利语",
-        "hup": "胡帕语",
-        "hye": "亚美尼亚语",
-        "iba": "伊班语",
-        "ibo": "伊博语",
-        "ido": "伊多语",
-        "iii": "彝语（四川）",
-        "iku": "伊努伊特语",
-        "ile": "国际语（西方）",
-        "ilo": "伊洛卡诺语",
-        "ina": "国际语",
-        "ind": "印尼语",
-        "inh": "印古什语",
-        "ipk": "依努庇克语",
-        "isl": "冰岛语",
-        "ita": "意大利语",
-        "jav": "爪哇语",
-        "jbo": "逻辑语",
-        "jpn": "日语",
-        "jpr": "犹太-波斯语",
-        "jrb": "犹太-阿拉伯语",
-        "kaa": "卡拉卡尔帕克语",
-        "kab": "卡布列语",
-        "kac": "景颇语",
-        "kal": "格陵兰语",
-        "kam": "坎巴语（肯尼亚）",
-        "kan": "卡纳达语",
-        "kas": "克什米尔语",
-        "kat": "格鲁吉亚语",
-        "kau": "卡努里语",
-        "kaw": "卡威语",
-        "kaz": "哈萨克语",
-        "kbd": "卡巴尔达语",
-        "kha": "卡西语",
-        "khm": "高棉语",
-        "kho": "和田语",
-        "kik": "基库尤语",
-        "kin": "基尼阿万达语",
-        "kir": "吉尔吉斯语",
-        "kmb": "金本杜语",
-        "kok": "孔卡尼语",
-        "kom": "科米语",
-        "kon": "刚果语",
-        "kor": "朝鲜语",
-        "kos": "科斯拉伊语",
-        "kpe": "克佩勒语",
-        "krc": "卡拉恰伊-巴尔卡尔语",
-        "krl": "卡累利阿语",
-        "kru": "库卢克语",
-        "kua": "宽亚玛语",
-        "kum": "库梅克语",
-        "kur": "库尔德语",
-        "kut": "库特内语",
-        "lad": "拉迪诺语",
-        "lah": "拉亨达语",
-        "lam": "兰巴语",
-        "lao": "老挝语",
-        "lat": "拉丁语",
-        "lav": "拉脱维亚语",
-        "lez": "列兹金语",
-        "lim": "林堡语",
-        "lin": "林加拉语",
-        "lit": "立陶宛语",
-        "lol": "芒戈语",
-        "loz": "洛齐语",
-        "ltz": "卢森堡语",
-        "lua": "卢巴-卢拉语",
-        "lub": "卢巴-加丹加语",
-        "lug": "干达语",
-        "lui": "卢伊塞诺语",
-        "lun": "隆达语",
-        "luo": "卢奥语（肯尼亚和坦桑尼亚）",
-        "lus": "卢萨语",
-        "mad": "马都拉语",
-        "mag": "摩揭陀语",
-        "mah": "马绍尔语",
-        "mai": "米德勒语",
-        "mak": "望加锡语",
-        "mal": "马拉雅拉姆语",
-        "man": "曼丁哥语",
-        "mar": "马拉地语",
-        "mas": "马萨伊语",
-        "mdf": "莫克沙语",
-        "mdr": "曼达语",
-        "men": "门德语（塞拉利昂）",
-        "mga": "爱尔兰语（中古，900-1200）",
-        "mic": "米克马克语",
-        "min": "米南卡保语",
-        "mis": "未被编码的语言",
-        "mkd": "马其顿语",
-        "mlg": "马达加斯加语",
-        "mlt": "马耳他语",
-        "mnc": "满语",
-        "mni": "曼尼普尔语",
-        "moh": "莫霍克语",
-        "mon": "蒙古语",
-        "mos": "莫西语",
-        "mri": "毛利语",
-        "msa": "马来语族",
-        "mul": "多种语言",
-        "mus": "克里克语",
-        "mwl": "米兰德斯语",
-        "mwr": "马尔瓦利语",
-        "mya": "缅甸语",
-        "myv": "厄尔兹亚语",
-        "nap": "拿坡里语",
-        "nau": "瑙鲁语",
-        "nav": "纳瓦霍语",
-        "nbl": "恩德贝勒语（南）",
-        "nde": "恩德贝勒语（北）",
-        "ndo": "恩敦加语",
-        "nds": "撒克逊语（低地）",
-        "nep": "尼泊尔语",
-        "new": "尼瓦尔语",
-        "nia": "尼亚斯语",
-        "niu": "纽埃语",
-        "nld": "荷兰语",
-        "nno": "新挪威语",
-        "nob": "挪威布克莫尔语",
-        "nog": "诺盖语",
-        "non": "诺尔斯语（古）",
-        "nor": "挪威语",
-        "nqo": "西非书面语言字母",
-        "nso": "索托语（北）",
-        "nwc": "尼瓦尔语（古典）",
-        "nya": "尼扬贾语",
-        "nym": "尼扬韦齐语",
-        "nyn": "尼扬科勒语",
-        "nyo": "尼奥罗语",
-        "nzi": "恩济马语",
-        "oci": "奥克西唐语（1500 后）",
-        "oji": "奥吉布瓦语",
-        "ori": "奥利亚语",
-        "orm": "奥罗莫语",
-        "osa": "奥萨格语",
-        "oss": "奥塞梯语",
-        "ota": "土耳其语（奥斯曼，1500-1928）",
-        "pag": "邦阿西楠语",
-        "pal": "钵罗钵语",
-        "pam": "邦板牙语",
-        "pan": "旁遮普语",
-        "pap": "帕皮亚门托语",
-        "pau": "帕劳语",
-        "peo": "波斯语（古，公元前约 600-400）",
-        "phn": "腓尼基语",
-        "pli": "巴利语",
-        "pol": "波兰语",
-        "pon": "波纳佩语",
-        "por": "葡萄牙语",
-        "pro": "普罗旺斯语（古，至 1500）",
-        "pus": "普什图语",
-        "que": "克丘亚语",
-        "raj": "拉贾斯坦语",
-        "rap": "拉帕努伊语",
-        "rar": "拉罗汤加语",
-        "roh": "罗曼什语",
-        "rom": "罗姆语",
-        "ron": "罗马尼亚语",
-        "run": "基隆迪语",
-        "rup": "阿罗马尼亚语",
-        "rus": "俄语",
-        "sad": "桑达韦语",
-        "sag": "桑戈语",
-        "sah": "雅库特语",
-        "sam": "阿拉米语（萨马利亚）",
-        "san": "梵语",
-        "sas": "萨萨克语",
-        "sat": "桑塔利语",
-        "scn": "西西里语",
-        "sco": "苏格兰语",
-        "sel": "塞尔库普语",
-        "sga": "爱尔兰语（古，至 900）",
-        "shn": "掸语",
-        "sid": "锡达莫语",
-        "sin": "僧加罗语",
-        "slk": "斯洛伐克语",
-        "slv": "斯洛文尼亚语",
-        "sma": "萨米语（南）",
-        "sme": "萨米语（北）",
-        "smj": "律勒欧-萨米语",
-        "smn": "伊纳里-萨米语",
-        "smo": "萨摩亚语",
-        "sms": "斯科特-萨米语",
-        "sna": "修纳语",
-        "snd": "信德语",
-        "snk": "索宁克语",
-        "sog": "粟特语",
-        "som": "索马里语",
-        "sot": "索托语（南）",
-        "spa": "西班牙语",
-        "sqi": "阿尔巴尼亚语",
-        "srd": "撒丁语",
-        "srn": "苏里南汤加语",
-        "srp": "塞尔维亚语",
-        "srr": "塞雷尔语",
-        "ssw": "斯瓦特语",
-        "suk": "苏库马语",
-        "sun": "巽他语",
-        "sus": "苏苏语",
-        "sux": "苏美尔语",
-        "swa": "斯瓦希里语族",
-        "swe": "瑞典语",
-        "syc": "叙利亚语（古典）",
-        "syr": "古叙利亚语",
-        "tah": "塔希提语",
-        "tam": "泰米尔语",
-        "tat": "塔塔尔语",
-        "tel": "泰卢固语",
-        "tem": "滕内语",
-        "ter": "特列纳语",
-        "tet": "特塔姆语",
-        "tgk": "塔吉克语",
-        "tgl": "塔加洛语",
-        "tha": "泰语",
-        "tig": "提格雷语",
-        "tir": "提格里尼亚语",
-        "tiv": "蒂夫语",
-        "tkl": "托克劳语",
-        "tlh": "克林贡语",
-        "tli": "特林吉特语",
-        "tmh": "塔马舍克语",
-        "tog": "汤加语 (尼亚萨)",
-        "ton": "汤加语（汤加岛）",
-        "tpi": "托克皮辛语",
-        "tsi": "钦西安语",
-        "tsn": "茨瓦纳语",
-        "tso": "聪加语",
-        "tuk": "土库曼语",
-        "tum": "奇图姆布卡语",
-        "tur": "土耳其语",
-        "tvl": "图瓦卢语",
-        "twi": "契维语",
-        "tyv": "图瓦语",
-        "udm": "乌德穆尔特语",
-        "uga": "乌加里特语",
-        "uig": "维吾尔语",
-        "ukr": "乌克兰语",
-        "umb": "翁本杜语",
-        "und": "未确定的语言",
-        "urd": "乌尔都语",
-        "uzb": "乌兹别克语",
-        "vai": "瓦伊语",
-        "ven": "文达语",
-        "vie": "越南语",
-        "vol": "沃拉普克语",
-        "vot": "沃提克语",
-        "wal": "瓦拉莫语",
-        "war": "瓦赖语（菲律宾）",
-        "was": "瓦肖语",
-        "wln": "瓦龙语",
-        "wol": "沃洛夫语",
-        "xal": "卡尔梅克语",
-        "xho": "科萨语",
-        "yao": "瑶语",
-        "yap": "雅浦语",
-        "yid": "依地语",
-        "yor": "约鲁巴语",
-        "zap": "萨波特克语",
-        "zbl": "布利斯符号",
-        "zen": "哲纳加语",
-        "zha": "壮语",
-        "zho": "中文",
-        "zul": "祖鲁语",
-        "zun": "祖尼语",
-        "zxx": "No linguistic content",
-        "zza": "扎扎其语"
-    },
-    "fi": {
-        "aar": "afar",
-        "abk": "abhaasi",
-        "ace": "aceh",
-        "ach": "atšoli",
-        "ada": "adangme",
-        "ady": "adyge",
-        "afh": "afrihili",
-        "afr": "afrikaans",
-        "ain": "Ainu (Japan)",
-        "aka": "Akan",
-        "akk": "akkadi",
-        "ale": "aleutti",
-        "alt": "Altai; Southern",
-        "amh": "amhara",
-        "ang": "English; Old (ca. 450-1100)",
-        "anp": "angika",
-        "ara": "arabia",
-        "arc": "Aramaic; Official (700-300 BCE)",
-        "arg": "aragonia",
-        "arn": "Mapudungun",
-        "arp": "arapaho",
-        "arw": "arawak",
-        "asm": "asami",
-        "ast": "asturia",
-        "ava": "avaari",
-        "ave": "avestan",
-        "awa": "awadhi",
-        "aym": "Aymara",
-        "aze": "azeri",
-        "bak": "baškiiri",
-        "bal": "belutši",
-        "bam": "Bambara",
-        "ban": "bali",
-        "bas": "Basa (Cameroon)",
-        "bej": "beja",
-        "bel": "valkovenäjä",
-        "bem": "Bemba (Zambia)",
-        "ben": "bengali",
-        "bho": "bhojpuri",
-        "bik": "bikol",
-        "bin": "bini",
-        "bis": "bislama",
-        "bla": "mustajalka (siksika)",
-        "bod": "tiibetti",
-        "bos": "bosnia",
-        "bra": "bradž",
-        "bre": "bretoni",
-        "bua": "burjaatti",
-        "bug": "bugi",
-        "bul": "bulgaria",
-        "byn": "Bilin",
-        "cad": "caddo",
-        "car": "Carib; Galibi",
-        "cat": "katalaani",
-        "ceb": "cebuano",
-        "ces": "tšekki",
-        "cha": "chamorro",
-        "chb": "chibcha",
-        "che": "tšetšeeni",
-        "chg": "Chagatai",
-        "chk": "chuuk",
-        "chm": "mari (Venäjä)",
-        "chn": "chinook-jargon",
-        "cho": "choctaw",
-        "chp": "chipewyan",
-        "chr": "cherokee",
-        "chu": "Slavonic; Old",
-        "chv": "tšuvassi",
-        "chy": "cheyenne",
-        "cop": "kopti",
-        "cor": "korni",
-        "cos": "korsika",
-        "cre": "cree",
-        "crh": "krimintataari",
-        "csb": "kašubi",
-        "cym": "kymri",
-        "dak": "dakota",
-        "dan": "tanska",
-        "dar": "dargva",
-        "del": "delaware",
-        "den": "athapaski-slavi",
-        "deu": "saksa",
-        "dgr": "dogrib",
-        "din": "Dinka",
-        "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "alasorbi",
-        "dua": "duala",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "dyula",
-        "dzo": "dzongkha",
-        "efi": "efik",
-        "egy": "muinaisegypti",
-        "eka": "ekajuk",
-        "ell": "nykykreikka",
-        "elx": "elami",
-        "eng": "englanti",
-        "enm": "keskienglanti",
-        "epo": "esperanto",
-        "est": "viro",
-        "eus": "baski",
-        "ewe": "ewe",
-        "ewo": "ewondo",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "fääri",
-        "fas": "persia",
-        "fat": "fanti",
-        "fij": "fidži",
-        "fil": "filipino",
-        "fin": "suomi",
-        "fon": "fon",
-        "fra": "ranska",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "fulani",
-        "fur": "friuli",
-        "gaa": "gã",
-        "gay": "gayo",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "ge'ez",
-        "gil": "kiribati",
-        "gla": "Gaelic; Scottish",
-        "gle": "iiri",
-        "glg": "galicia",
-        "glv": "manksi",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "gondi",
-        "gor": "gorontalo",
-        "got": "gootti",
-        "grb": "grebo",
-        "grc": "muinaiskreikka",
-        "grn": "guarani",
-        "gsw": "German; Swiss",
-        "guj": "gujarati",
-        "gwi": "Gwichʼin",
-        "hai": "haida",
-        "hat": "Creole; Haitian",
-        "hau": "hausa",
-        "haw": "havaiji",
-        "heb": "heprea",
-        "her": "herero",
-        "hil": "hiligaynon",
-        "hin": "hindi",
-        "hit": "heetti",
-        "hmn": "hmong",
-        "hmo": "hiri-motu",
-        "hrv": "kroatia",
-        "hsb": "Sorbian; Upper",
-        "hun": "unkari",
-        "hup": "hupa",
-        "hye": "armenia",
-        "iba": "Iban",
-        "ibo": "igbo",
-        "ido": "ido",
-        "iii": "Yi; Sichuan",
-        "iku": "inuktitut",
-        "ile": "interlingue",
-        "ilo": "iloko",
-        "ina": "interlingua",
-        "ind": "indonesia",
-        "inh": "inguuši",
-        "ipk": "iñupiaq",
-        "isl": "islanti",
-        "ita": "italia",
-        "jav": "jaava",
-        "jbo": "lojban",
-        "jpn": "japani",
-        "jpr": "juutalaispersia",
-        "jrb": "juutalaisarabia",
-        "kaa": "karakalpakki",
-        "kab": "kabyyli",
-        "kac": "kachin",
-        "kal": "grönlanti",
-        "kam": "Kamba (Kenya)",
-        "kan": "kannada",
-        "kas": "kashmiri",
-        "kat": "georgia",
-        "kau": "kanuri",
-        "kaw": "kavi",
-        "kaz": "kazakki",
-        "kbd": "kabardi",
-        "kha": "Khasi",
-        "khm": "Khmer; Central",
-        "kho": "khotani",
-        "kik": "kikuyu",
-        "kin": "ruanda",
-        "kir": "kirgiisi",
-        "kmb": "kimbundu",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "komi",
-        "kon": "Kongo",
-        "kor": "korea",
-        "kos": "kosrae",
-        "kpe": "kpelle",
-        "krc": "karatšai-balkaari",
-        "krl": "karjala",
-        "kru": "kurukh",
-        "kua": "kuanjama",
-        "kum": "kumykki",
-        "kur": "kurdi",
-        "kut": "kutenai",
-        "lad": "ladino",
-        "lah": "lahnda",
-        "lam": "lamba",
-        "lao": "lao",
-        "lat": "latina",
-        "lav": "latvia",
-        "lez": "lezgi",
-        "lim": "Limburgan",
-        "lin": "lingala",
-        "lit": "liettua",
-        "lol": "mongo",
-        "loz": "lozi",
-        "ltz": "Luxemburg",
-        "lua": "luba (Lulua)",
-        "lub": "luba (Katanga)",
-        "lug": "Ganda",
-        "lui": "luiseño",
-        "lun": "lunda",
-        "luo": "luo",
-        "lus": "lushai",
-        "mad": "madura",
-        "mag": "magahi",
-        "mah": "Marshallese",
-        "mai": "maithili",
-        "mak": "Makasar",
-        "mal": "malayalam",
-        "man": "mandingo",
-        "mar": "marathi",
-        "mas": "masai",
-        "mdf": "mokša",
-        "mdr": "mandar",
-        "men": "Mende (Sierra Leone)",
-        "mga": "keski-iiri",
-        "mic": "Mi'kmaq",
-        "min": "minangkabau",
-        "mis": "Uncoded languages",
-        "mkd": "makedonia",
-        "mlg": "malagassi",
-        "mlt": "malta",
-        "mnc": "mantšu",
-        "mni": "manipuri",
-        "moh": "mohawk",
-        "mon": "Mongolian",
-        "mos": "mossi",
-        "mri": "maori",
-        "msa": "Malay (macrolanguage)",
-        "mul": "monia kieliä",
-        "mus": "muskogi",
-        "mwl": "mirandês",
-        "mwr": "marwari",
-        "mya": "burma",
-        "myv": "ersä",
-        "nap": "napoli",
-        "nau": "nauru",
-        "nav": "Navajo",
-        "nbl": "ndebele; eteländebele",
-        "nde": "ndebele; pohjoisndebele",
-        "ndo": "ndonga",
-        "nds": "German; Low",
-        "nep": "nepali",
-        "new": "Bhasa; Nepal",
-        "nia": "nias",
-        "niu": "niue",
-        "nld": "hollanti",
-        "nno": "norja (uusnorja)",
-        "nob": "Norwegian Bokmål",
-        "nog": "nogai",
-        "non": "muinaisnorja",
-        "nor": "norja",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
-        "nym": "nyamwezi",
-        "nyn": "nyankole",
-        "nyo": "Nyoro",
-        "nzi": "nzima",
-        "oci": "Occitan (post 1500)",
-        "oji": "Ojibwa",
-        "ori": "oriya",
-        "orm": "oromo",
-        "osa": "osage",
-        "oss": "Ossetian",
-        "ota": "osmaninturkki",
-        "pag": "pangasinan",
-        "pal": "pahlavi",
-        "pam": "pampanga",
-        "pan": "Panjabi",
-        "pap": "papiamentu",
-        "pau": "palau",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "foinikia",
-        "pli": "Pali",
-        "pol": "puola",
-        "pon": "pohnpei",
-        "por": "portugali",
-        "pro": "muinaisprovensaali",
-        "pus": "pašto",
-        "que": "Quechua",
-        "raj": "rajasthani",
-        "rap": "rapanui",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "romani",
-        "ron": "romania",
-        "run": "rundi",
-        "rup": "Romanian; Macedo-",
-        "rus": "venäjä",
-        "sad": "sandawe",
-        "sag": "Sango",
-        "sah": "jakuutti",
-        "sam": "Aramaic; Samaritan",
-        "san": "sanskrit",
-        "sas": "Sasak",
-        "sat": "santali",
-        "scn": "sisilia",
-        "sco": "skotti",
-        "sel": "selkuppi",
-        "sga": "muinaisiiri",
-        "shn": "shan",
-        "sid": "sidamo",
-        "sin": "Sinhala",
-        "slk": "slovakki",
-        "slv": "sloveeni",
-        "sma": "eteläsaame",
-        "sme": "pohjoissaame",
-        "smj": "luulajansaame",
-        "smn": "inarinsaame",
-        "smo": "samoa",
-        "sms": "koltansaami",
-        "sna": "shona",
-        "snd": "sindhi",
-        "snk": "soninke",
-        "sog": "sogdi",
-        "som": "somali",
-        "sot": "eteläsotho",
-        "spa": "espanja",
-        "sqi": "albania",
-        "srd": "sardi",
-        "srn": "Sranan Tongo",
-        "srp": "serbia",
-        "srr": "Serer",
-        "ssw": "swazi",
-        "suk": "sukuma",
-        "sun": "sunda",
-        "sus": "susu",
-        "sux": "sumeri",
-        "swa": "Swahili (macrolanguage)",
-        "swe": "ruotsi",
-        "syc": "Syriac; Classical",
-        "syr": "syyria",
-        "tah": "tahiti",
-        "tam": "tamili",
-        "tat": "tataari",
-        "tel": "Telugu",
-        "tem": "temne",
-        "ter": "tereno",
-        "tet": "tetum",
-        "tgk": "tadžikki",
-        "tgl": "tagalog",
-        "tha": "thai",
-        "tig": "tigre",
-        "tir": "tigrinya",
-        "tiv": "tiv",
-        "tkl": "tokelau",
-        "tlh": "Klingon",
-        "tli": "tlinglit",
-        "tmh": "Tamashek",
-        "tog": "Malawin tonga",
-        "ton": "Tongan tonga",
-        "tpi": "tok-pisin",
-        "tsi": "tsimshian",
-        "tsn": "tswana",
-        "tso": "tsonga",
-        "tuk": "turkmeeni",
-        "tum": "tumbuka",
-        "tur": "turkki",
-        "tvl": "tuvalu",
-        "twi": "twi",
-        "tyv": "tuva",
-        "udm": "udmurtti",
-        "uga": "ugarit",
-        "uig": "uiguuri",
-        "ukr": "ukraina",
-        "umb": "umbundu",
-        "und": "määrittämätön",
-        "urd": "urdu",
-        "uzb": "uzbekki",
-        "vai": "vai",
-        "ven": "venda",
-        "vie": "vietnam",
-        "vol": "volapük",
-        "vot": "vatja",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "washo",
-        "wln": "valloni",
-        "wol": "wolof",
-        "xal": "Kalmyk",
-        "xho": "xhosa",
-        "yao": "mien",
-        "yap": "yap",
-        "yid": "jiddiš",
-        "yor": "yoruba",
-        "zap": "Zapotec",
-        "zbl": "Blissymbols",
-        "zen": "zenaga",
-        "zha": "Zhuang",
-        "zho": "kiina",
-        "zul": "zulu",
-        "zun": "zuni",
-        "zxx": "No linguistic content",
-        "zza": "Zaza"
-    },
     "it": {
         "aar": "Afar",
         "abk": "Abkhazian",
@@ -3747,846 +3327,6 @@ LANGUAGE_NAMES = {
         "zxx": "Nessun contenuto linguistico",
         "zza": "Zaza"
     },
-    "uk": {
-        "aar": "афар",
-        "abk": "абхазька",
-        "ace": "ачеська",
-        "ach": "ачолі",
-        "ada": "адангме",
-        "ady": "адигейська",
-        "afh": "афрингілі",
-        "afr": "африкаанс",
-        "ain": "айнська (Японія)",
-        "aka": "акан",
-        "akk": "аккадська",
-        "ale": "алеутська",
-        "alt": "алтайська (південна)",
-        "amh": "амхарська",
-        "ang": "давньоанглійська (бл. 450-1100)",
-        "anp": "ангіка",
-        "ara": "арабська",
-        "arc": "арамейська (офіційна; 700-300 до нашої ери)",
-        "arg": "арагонська",
-        "arn": "арауканська",
-        "arp": "арапахо",
-        "arw": "аравакська",
-        "asm": "ассамська",
-        "ast": "астурійська",
-        "ava": "аварська",
-        "ave": "авестанська",
-        "awa": "авадхі",
-        "aym": "аймарська",
-        "aze": "азербайджанська",
-        "bak": "башкирська",
-        "bal": "белуджійська",
-        "bam": "бамбара",
-        "ban": "балійська",
-        "bas": "баса (Камерун)",
-        "bej": "бежа",
-        "bel": "білоруська",
-        "bem": "бемба (Замбія)",
-        "ben": "бенгальська",
-        "bho": "бходжпурі",
-        "bik": "бікольська",
-        "bin": "біні",
-        "bis": "біслама",
-        "bla": "сісіка",
-        "bod": "тибетська",
-        "bos": "боснійська",
-        "bra": "брай",
-        "bre": "бретонська",
-        "bua": "бурятська",
-        "bug": "бугійська",
-        "bul": "болгарська",
-        "byn": "білін",
-        "cad": "каддо",
-        "car": "карибська (галібі)",
-        "cat": "каталонська",
-        "ceb": "себуано",
-        "ces": "чеська",
-        "cha": "чаморо",
-        "chb": "чибча",
-        "che": "чеченська",
-        "chg": "чагатайська",
-        "chk": "чуукська",
-        "chm": "марійська (Росія)",
-        "chn": "чинук; жаргон",
-        "cho": "чоктау",
-        "chp": "чипев’ян",
-        "chr": "черокі",
-        "chu": "давньослов’янська",
-        "chv": "чуваська",
-        "chy": "шаєнн",
-        "cop": "коптська",
-        "cor": "корнійська",
-        "cos": "корсиканська",
-        "cre": "крі",
-        "crh": "турецька (кримська)",
-        "csb": "кашубська",
-        "cym": "валійська",
-        "dak": "дакота",
-        "dan": "данська",
-        "dar": "даргва",
-        "del": "делаварська",
-        "den": "слейві (атабаська)",
-        "deu": "німецька",
-        "dgr": "догріб",
-        "din": "дінка",
-        "div": "мальдивська",
-        "doi": "догрі (макромова)",
-        "dsb": "нижньолужицька",
-        "dua": "дуала",
-        "dum": "середньовічна голландська (бл. 1050-1350)",
-        "dyu": "діула",
-        "dzo": "дзонг-ке",
-        "efi": "ефік",
-        "egy": "давньоєгипетська",
-        "eka": "екаджук",
-        "ell": "грецька (з 1453)",
-        "elx": "еламська",
-        "eng": "англійська",
-        "enm": "середньоанглійська (1100-1500)",
-        "epo": "есперанто",
-        "est": "естонська",
-        "eus": "баскська",
-        "ewe": "еве",
-        "ewo": "евондо",
-        "fan": "фанг (Екваторіальна Гвінея)",
-        "fao": "фарерська",
-        "fas": "перська",
-        "fat": "фанті",
-        "fij": "фіджійська",
-        "fil": "філіппінська",
-        "fin": "фінська",
-        "fon": "фон",
-        "fra": "французька",
-        "frm": "середньофранцузька (бл. 1400-1600)",
-        "fro": "давньофранцузька (842-бл. 1400)",
-        "frr": "фризька (північна)",
-        "frs": "фризька (східна)",
-        "fry": "фризька (західна)",
-        "ful": "фулах",
-        "fur": "фріульська",
-        "gaa": "га",
-        "gay": "гайо",
-        "gba": "гбая (Центральноафриканська Республіка)",
-        "gez": "гііз",
-        "gil": "гільбертська",
-        "gla": "гаельська (Шотландія)",
-        "gle": "ірландська",
-        "glg": "галісійська",
-        "glv": "манкс",
-        "gmh": "середньоверхньонімецька (бл. 1050-1500)",
-        "goh": "давньосередньонімецька (бл. 750-1050)",
-        "gon": "гонді",
-        "gor": "горонтало",
-        "got": "готська",
-        "grb": "гребо",
-        "grc": "давньогрецька (до 1453)",
-        "grn": "гуарані",
-        "gsw": "німецька (Швейцарія)",
-        "guj": "гуджараті",
-        "gwi": "гвічин",
-        "hai": "хайда",
-        "hat": "креольська (гаїтянська)",
-        "hau": "хауса",
-        "haw": "гавайська",
-        "heb": "іврит",
-        "her": "гереро",
-        "hil": "хілігайнон",
-        "hin": "хінді",
-        "hit": "хетська",
-        "hmn": "хмонг",
-        "hmo": "хірімоту",
-        "hrv": "хорватська",
-        "hsb": "верхньолужицька",
-        "hun": "угорська",
-        "hup": "хупа",
-        "hye": "вірменська",
-        "iba": "ібанська",
-        "ibo": "ігбо",
-        "ido": "ідо",
-        "iii": "ї (Сичуань)",
-        "iku": "інуктітут",
-        "ile": "окциденталь",
-        "ilo": "ілоко",
-        "ina": "інтерлінгва (Асоціація міжнародної допоміжної мови)",
-        "ind": "індонезійська",
-        "inh": "інгушська",
-        "ipk": "інупіак",
-        "isl": "ісландська",
-        "ita": "італійська",
-        "jav": "яванська",
-        "jbo": "ложбан",
-        "jpn": "японська",
-        "jpr": "єврейсько-перська",
-        "jrb": "єврейсько-арабська",
-        "kaa": "каракалпацька",
-        "kab": "кабильська",
-        "kac": "качин",
-        "kal": "калаалісут",
-        "kam": "камба (Кенія)",
-        "kan": "каннада",
-        "kas": "кашмірська",
-        "kat": "грузинська",
-        "kau": "канурі",
-        "kaw": "каві",
-        "kaz": "казахська",
-        "kbd": "кабардінська",
-        "kha": "кхасі",
-        "khm": "кхмерська (центральна)",
-        "kho": "хотаносакська",
-        "kik": "кікуйю",
-        "kin": "кіньяруанда",
-        "kir": "киргизька",
-        "kmb": "кімбунду",
-        "kok": "конкані (макромова)",
-        "kom": "комі",
-        "kon": "конго",
-        "kor": "корейська",
-        "kos": "косрейська",
-        "kpe": "кпелле",
-        "krc": "карачаєво-балкарська",
-        "krl": "карельська",
-        "kru": "курух",
-        "kua": "куаньяма",
-        "kum": "кумикська",
-        "kur": "курдська",
-        "kut": "кутенай",
-        "lad": "ладіно",
-        "lah": "лахнда",
-        "lam": "ламба",
-        "lao": "лаоська",
-        "lat": "латинська",
-        "lav": "латиська",
-        "lez": "лезгінська",
-        "lim": "лімбурганська",
-        "lin": "лінгала",
-        "lit": "литовська",
-        "lol": "монго",
-        "loz": "лозі",
-        "ltz": "люксембурзька",
-        "lua": "луба-лулуа",
-        "lub": "луба-катанга",
-        "lug": "ганда",
-        "lui": "луйсеньо",
-        "lun": "лунда",
-        "luo": "луо (Кенія і Танзанія)",
-        "lus": "лушай",
-        "mad": "мадурська",
-        "mag": "магахі",
-        "mah": "маршальська",
-        "mai": "майтхілі",
-        "mak": "макасарська",
-        "mal": "малаялам",
-        "man": "мандінго",
-        "mar": "мараті",
-        "mas": "масаї",
-        "mdf": "мокшанська",
-        "mdr": "мандарська",
-        "men": "менде (Сьєрра-Леоне)",
-        "mga": "середньоірландська (900-1200)",
-        "mic": "мікмак",
-        "min": "мінангкабау",
-        "mis": "мови без коду",
-        "mkd": "македонська",
-        "mlg": "малагасійська",
-        "mlt": "мальтійська",
-        "mnc": "манчжурська",
-        "mni": "маніпурська",
-        "moh": "мохаук",
-        "mon": "монгольська",
-        "mos": "мосі",
-        "mri": "маорійська",
-        "msa": "малайська (макромова)",
-        "mul": "мови; що належать до декількох родин",
-        "mus": "крікська",
-        "mwl": "мірандська",
-        "mwr": "марварі",
-        "mya": "бірманська",
-        "myv": "ерзянська",
-        "nap": "неаполітанська",
-        "nau": "науру",
-        "nav": "навахо",
-        "nbl": "південна ндебеле",
-        "nde": "північна ндебеле",
-        "ndo": "ндонга",
-        "nds": "нижньонімецька",
-        "nep": "непальська",
-        "new": "бхаса (Непал)",
-        "nia": "ніасійська",
-        "niu": "ніуе",
-        "nld": "голландська",
-        "nno": "норвезька нюноршк",
-        "nob": "норвезька букмол",
-        "nog": "ногайська",
-        "non": "давньонорвезька",
-        "nor": "норвезька",
-        "nqo": "н’ко",
-        "nso": "сото; північне",
-        "nwc": "неварі (давня)",
-        "nya": "ньянджа",
-        "nym": "ньямвезі",
-        "nyn": "ньянколе",
-        "nyo": "ньоро",
-        "nzi": "нзіма",
-        "oci": "оксітанська (після 1500)",
-        "oji": "оджибва",
-        "ori": "орія",
-        "orm": "оромо",
-        "osa": "оседжі",
-        "oss": "осетинська",
-        "ota": "оттоманська турецька (1500-1928)",
-        "pag": "пангасінан",
-        "pal": "пехлевійська",
-        "pam": "пампанга",
-        "pan": "пенджабі",
-        "pap": "папьяменто",
-        "pau": "палау",
-        "peo": "давньоперська (бл. 600-400 до н.е.)",
-        "phn": "фінікійська",
-        "pli": "палі",
-        "pol": "польська",
-        "pon": "понапе",
-        "por": "португальська",
-        "pro": "провансальська (давня; до 1500 року)",
-        "pus": "пуштунська",
-        "que": "кечуа",
-        "raj": "раджастхані",
-        "rap": "рапануї",
-        "rar": "маорійська (острови Кука)",
-        "roh": "ретророманська",
-        "rom": "ромська",
-        "ron": "румунська",
-        "run": "рунді",
-        "rup": "македоно-румунська",
-        "rus": "російська",
-        "sad": "сандаве",
-        "sag": "санго",
-        "sah": "якутська",
-        "sam": "арамейська (самаритянська)",
-        "san": "санскрит",
-        "sas": "сасакська",
-        "sat": "санталі",
-        "scn": "сицилійська",
-        "sco": "шотландська",
-        "sel": "селькупська",
-        "sga": "давньоірландська (до 900)",
-        "shn": "шан",
-        "sid": "сидама",
-        "sin": "сингалійська",
-        "slk": "словацька",
-        "slv": "словенська",
-        "sma": "саамська (південна)",
-        "sme": "саамська (північна)",
-        "smj": "лулесаамська",
-        "smn": "саамська (інарі)",
-        "smo": "самоанська",
-        "sms": "саамська (сколт)",
-        "sna": "шона",
-        "snd": "синдхі",
-        "snk": "сонікійська",
-        "sog": "согдійська",
-        "som": "сомалійська",
-        "sot": "сото; південна",
-        "spa": "іспанська",
-        "sqi": "албанська",
-        "srd": "сардинська",
-        "srn": "сранан-тонго",
-        "srp": "сербська",
-        "srr": "серер",
-        "ssw": "свазі",
-        "suk": "сукума",
-        "sun": "сунданська",
-        "sus": "сусу",
-        "sux": "шумерська",
-        "swa": "суахілі (макромова)",
-        "swe": "шведська",
-        "syc": "сирійська (класична)",
-        "syr": "сирійська",
-        "tah": "таїтянська",
-        "tam": "тамільська",
-        "tat": "татарська",
-        "tel": "телугу",
-        "tem": "тімне",
-        "ter": "терено",
-        "tet": "тетум",
-        "tgk": "таджицька",
-        "tgl": "тагалог",
-        "tha": "таїландська",
-        "tig": "тігре",
-        "tir": "тигринійська",
-        "tiv": "тиві",
-        "tkl": "токелау",
-        "tlh": "клінгонська",
-        "tli": "тлінгіт",
-        "tmh": "тамашек",
-        "tog": "тонга (ньяса)",
-        "ton": "тонга (острови Тонга)",
-        "tpi": "ток-пісін",
-        "tsi": "цимшіан",
-        "tsn": "тсвана",
-        "tso": "цонга",
-        "tuk": "туркменська",
-        "tum": "тумбука",
-        "tur": "турецька",
-        "tvl": "тувалу",
-        "twi": "тві",
-        "tyv": "тувінська",
-        "udm": "удмурдська",
-        "uga": "угаритська",
-        "uig": "уйгурська",
-        "ukr": "українська",
-        "umb": "умбунду",
-        "und": "невизначена",
-        "urd": "урду",
-        "uzb": "узбецька",
-        "vai": "вай",
-        "ven": "венда",
-        "vie": "в'єтнамська",
-        "vol": "волапюк",
-        "vot": "водська",
-        "wal": "волайтта",
-        "war": "варай (Філіппіни)",
-        "was": "вашо",
-        "wln": "валлонська",
-        "wol": "волоф",
-        "xal": "калмицька",
-        "xho": "хоза",
-        "yao": "яо",
-        "yap": "япська",
-        "yid": "ідиш",
-        "yor": "йоруба",
-        "zap": "сапотецька",
-        "zbl": "бліссимволіка",
-        "zen": "зеназька",
-        "zha": "чжуань",
-        "zho": "китайська",
-        "zul": "зулуська",
-        "zun": "зуні",
-        "zxx": "немає мовних даних",
-        "zza": "заза"
-    },
-    "de": {
-        "aar": "Danakil-Sprache",
-        "abk": "Abchasisch",
-        "ace": "Aceh-Sprache",
-        "ach": "Acholi-Sprache",
-        "ada": "Adangme-Sprache",
-        "ady": "Adygisch",
-        "afh": "Afrihili",
-        "afr": "Afrikaans",
-        "ain": "Ainu-Sprache (Japan)",
-        "aka": "Akan-Sprache",
-        "akk": "Akkadisch",
-        "ale": "Aleutisch",
-        "alt": "Altaisch; Süd",
-        "amh": "Amharisch",
-        "ang": "Englisch; Alt (ca. 450-1100)",
-        "anp": "Anga-Sprache",
-        "ara": "Arabisch",
-        "arc": "Aramäisch",
-        "arg": "Aragonesisch",
-        "arn": "Mapudungun",
-        "arp": "Arapaho",
-        "arw": "Arawakisch",
-        "asm": "Assamesisch",
-        "ast": "Asturisch",
-        "ava": "Awarisch",
-        "ave": "Avestisch",
-        "awa": "Awadhi",
-        "aym": "Aymara",
-        "aze": "Aserbaidschanisch",
-        "bak": "Baschkirisch",
-        "bal": "Belutschisch",
-        "bam": "Bambara",
-        "ban": "Balinesisch",
-        "bas": "Basa (Kamerun)",
-        "bej": "Bedja (Bedauye)",
-        "bel": "Weißrussisch",
-        "bem": "Bemba (Sambia)",
-        "ben": "Bengalisch",
-        "bho": "Bhojpuri",
-        "bik": "Bikol",
-        "bin": "Bini",
-        "bis": "Bislama",
-        "bla": "Blackfoot",
-        "bod": "Tibetisch",
-        "bos": "Bosnisch",
-        "bra": "Braj-Bhakha",
-        "bre": "Bretonisch",
-        "bua": "Burjatisch",
-        "bug": "Buginesisch",
-        "bul": "Bulgarisch",
-        "byn": "Bilin",
-        "cad": "Caddo",
-        "car": "Karibisch; Galíbi",
-        "cat": "Katalanisch",
-        "ceb": "Cebuano",
-        "ces": "Tschechisch",
-        "cha": "Chamorro",
-        "chb": "Chibcha",
-        "che": "Tschetschenisch",
-        "chg": "Tschagataisch",
-        "chk": "Trukesisch",
-        "chm": "Mari (Russland)",
-        "chn": "Chinook",
-        "cho": "Choctaw",
-        "chp": "Chipewyan",
-        "chr": "Cherokee",
-        "chu": "Altkirchenslawisch",
-        "chv": "Tschuwaschisch",
-        "chy": "Cheyenne",
-        "cop": "Koptisch",
-        "cor": "Kornisch",
-        "cos": "Korsisch",
-        "cre": "Cree",
-        "crh": "Türkisch; Krimtatarisch",
-        "csb": "Kaschubisch",
-        "cym": "Walisisch",
-        "dak": "Dakota",
-        "dan": "Dänisch",
-        "dar": "Darginisch",
-        "del": "Delaware",
-        "den": "Slave (Athapaskisch)",
-        "deu": "Deutsch",
-        "dgr": "Dogrib",
-        "din": "Dinka",
-        "div": "Dhivehi",
-        "doi": "Dogri (Makrosprache)",
-        "dsb": "Sorbisch; Nieder",
-        "dua": "Duala",
-        "dum": "Niederländisch; Mittel (ca. 1050-1350)",
-        "dyu": "Dyula",
-        "dzo": "Dzongkha",
-        "efi": "Efik",
-        "egy": "Ägyptisch (Historisch)",
-        "eka": "Ekajuk",
-        "ell": "Neugriechisch (ab 1453)",
-        "elx": "Elamisch",
-        "eng": "Englisch",
-        "enm": "Mittelenglisch",
-        "epo": "Esperanto",
-        "est": "Estnisch",
-        "eus": "Baskisch",
-        "ewe": "Ewe-Sprache",
-        "ewo": "Ewondo",
-        "fan": "Fang (Äquatorial-Guinea)",
-        "fao": "Färöisch",
-        "fas": "Persisch",
-        "fat": "Fanti",
-        "fij": "Fidschianisch",
-        "fil": "Filipino",
-        "fin": "Finnisch",
-        "fon": "Fon",
-        "fra": "Französisch",
-        "frm": "Französisch; Mittel (ca. 1400 - 1600)",
-        "fro": "Französisch; Alt (842 - ca. 1400)",
-        "frr": "Friesisch; Nord",
-        "frs": "Friesisch; Ost",
-        "fry": "Friesisch; West",
-        "ful": "Ful",
-        "fur": "Friaulisch",
-        "gaa": "Ga",
-        "gay": "Gayo",
-        "gba": "Gbaya (Zentralafrikanische Republik)",
-        "gez": "Altäthiopisch",
-        "gil": "Gilbertesisch",
-        "gla": "Gälisch; Schottisch",
-        "gle": "Irisch",
-        "glg": "Galicisch",
-        "glv": "Manx",
-        "gmh": "Mittelhochdeutsch (ca. 1050-1500)",
-        "goh": "Althochdeutsch (ca. 750-1050)",
-        "gon": "Gondi",
-        "gor": "Gorontalesisch",
-        "got": "Gotisch",
-        "grb": "Grebo",
-        "grc": "Altgriechisch (bis 1453)",
-        "grn": "Guaraní",
-        "gsw": "Schweizerdeutsch",
-        "guj": "Gujarati",
-        "gwi": "Kutchin",
-        "hai": "Haida",
-        "hat": "Kreolisch; Haitisch",
-        "hau": "Haussa",
-        "haw": "Hawaiianisch",
-        "heb": "Hebräisch",
-        "her": "Herero",
-        "hil": "Hiligaynon",
-        "hin": "Hindi",
-        "hit": "Hethitisch",
-        "hmn": "Miao-Sprachen",
-        "hmo": "Hiri-Motu",
-        "hrv": "Kroatisch",
-        "hsb": "Obersorbisch",
-        "hun": "Ungarisch",
-        "hup": "Hupa",
-        "hye": "Armenisch",
-        "iba": "Iban",
-        "ibo": "Ibo",
-        "ido": "Ido",
-        "iii": "Yi; Sichuan",
-        "iku": "Inuktitut",
-        "ile": "Interlingue",
-        "ilo": "Ilokano",
-        "ina": "Interlingua (Internationale Hilfssprachen-Vereinigung)",
-        "ind": "Indonesisch",
-        "inh": "Inguschisch",
-        "ipk": "Inupiaq",
-        "isl": "Isländisch",
-        "ita": "Italienisch",
-        "jav": "Javanisch",
-        "jbo": "Lojban",
-        "jpn": "Japanisch",
-        "jpr": "Jüdisch-Persisch",
-        "jrb": "Jüdisch-Arabisch",
-        "kaa": "Karakalpakisch",
-        "kab": "Kabylisch",
-        "kac": "Kachinisch",
-        "kal": "Kalaallisut (Grönländisch)",
-        "kam": "Kamba (Kenia)",
-        "kan": "Kannada",
-        "kas": "Kaschmirisch",
-        "kat": "Georgisch",
-        "kau": "Kanuri",
-        "kaw": "Kawi; Altjavanisch",
-        "kaz": "Kasachisch",
-        "kbd": "Kabardisch",
-        "kha": "Khasi-Sprache",
-        "khm": "Khmer; Zentral",
-        "kho": "Sakisch",
-        "kik": "Kikuyu",
-        "kin": "Rwanda",
-        "kir": "Kirgisisch",
-        "kmb": "Mbundu; Kimbundu",
-        "kok": "Konkani (Makrosprache)",
-        "kom": "Komi",
-        "kon": "Kongo",
-        "kor": "Koreanisch",
-        "kos": "Kosraeanisch",
-        "kpe": "Kpelle",
-        "krc": "Karachay-Balkar",
-        "krl": "Karenisch",
-        "kru": "Kurukh",
-        "kua": "Kwanyama",
-        "kum": "Kumükisch",
-        "kur": "Kurdisch",
-        "kut": "Kutenai",
-        "lad": "Judenspanisch",
-        "lah": "Lahnda",
-        "lam": "Banjari; Lamba",
-        "lao": "Laotisch",
-        "lat": "Lateinisch",
-        "lav": "Lettisch",
-        "lez": "Lesgisch",
-        "lim": "Limburgisch",
-        "lin": "Lingala",
-        "lit": "Litauisch",
-        "lol": "Mongo",
-        "loz": "Rotse",
-        "ltz": "Luxemburgisch",
-        "lua": "Luba-Lulua",
-        "lub": "Luba-Katanga",
-        "lug": "Ganda",
-        "lui": "Luiseno",
-        "lun": "Lunda",
-        "luo": "Luo (Kenia und Tansania)",
-        "lus": "Lushai",
-        "mad": "Maduresisch",
-        "mag": "Khotta",
-        "mah": "Marshallesisch",
-        "mai": "Maithili",
-        "mak": "Makassarisch",
-        "mal": "Malayalam",
-        "man": "Mande; Mandigo; Malinke",
-        "mar": "Marathi",
-        "mas": "Massai",
-        "mdf": "Moksha",
-        "mdr": "Mandaresisch",
-        "men": "Mende (Sierra Leone)",
-        "mga": "Mittelirisch (900-1200)",
-        "mic": "Mikmak",
-        "min": "Minangkabau",
-        "mis": "Nichtklassifizierte Sprachen",
-        "mkd": "Makedonisch",
-        "mlg": "Madegassisch",
-        "mlt": "Maltesisch",
-        "mnc": "Manchu; Mandschurisch",
-        "mni": "Meithei-Sprache",
-        "moh": "Mohawk",
-        "mon": "Mongolisch",
-        "mos": "Mossi",
-        "mri": "Maori",
-        "msa": "Malaiisch (Makrosprache)",
-        "mul": "Mehrsprachig; Polyglott",
-        "mus": "Muskogee",
-        "mwl": "Mirandesisch",
-        "mwr": "Marwari",
-        "mya": "Burmesisch",
-        "myv": "Erzya",
-        "nap": "Neapolitanisch",
-        "nau": "Nauruanisch",
-        "nav": "Navajo",
-        "nbl": "Ndebele (Süd)",
-        "nde": "Ndebele (Nord)",
-        "ndo": "Ndonga",
-        "nds": "Plattdeutsch",
-        "nep": "Nepali",
-        "new": "Bhasa; Nepalesisch",
-        "nia": "Nias",
-        "niu": "Niue",
-        "nld": "Niederländisch",
-        "nno": "Nynorsk (Norwegen)",
-        "nob": "Norwegisch-Bokmål",
-        "nog": "Nogai",
-        "non": "Altnordisch",
-        "nor": "Norwegisch",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Nord",
-        "nwc": "Newari; Alt",
-        "nya": "Nyanja",
-        "nym": "Nyamwezi",
-        "nyn": "Nyankole",
-        "nyo": "Nyoro",
-        "nzi": "Nzima",
-        "oci": "Okzitanisch (nach 1500)",
-        "oji": "Ojibwa",
-        "ori": "Orija",
-        "orm": "Oromo",
-        "osa": "Osage",
-        "oss": "Ossetisch",
-        "ota": "Ottomanisch (Osmanisch/Türkisch) (1500-1928)",
-        "pag": "Pangasinan",
-        "pal": "Mittelpersisch",
-        "pam": "Pampanggan",
-        "pan": "Panjabi",
-        "pap": "Papiamento",
-        "pau": "Palau",
-        "peo": "Persisch; Alt (ca. 600-400 v.Chr.)",
-        "phn": "Phönikisch",
-        "pli": "Pali",
-        "pol": "Polnisch",
-        "pon": "Ponapeanisch",
-        "por": "Portugiesisch",
-        "pro": "Altokzitanisch; Altprovenzalisch (bis 1500)",
-        "pus": "Paschtu; Afghanisch",
-        "que": "Ketschua",
-        "raj": "Rajasthani",
-        "rap": "Osterinsel-Sprache; Rapanui",
-        "rar": "Maori; Cook-Inseln",
-        "roh": "Bündnerromanisch",
-        "rom": "Romani; Zigeunersprache",
-        "ron": "Rumänisch",
-        "run": "Rundi",
-        "rup": "Rumänisch; Mezedonisch",
-        "rus": "Russisch",
-        "sad": "Sandawe",
-        "sag": "Sango",
-        "sah": "Jakutisch",
-        "sam": "Aramäisch; Samaritanisch",
-        "san": "Sanskrit",
-        "sas": "Sassak",
-        "sat": "Santali",
-        "scn": "Sizilianisch",
-        "sco": "Schottisch",
-        "sel": "Selkupisch",
-        "sga": "Altirisch (bis 900)",
-        "shn": "Schan",
-        "sid": "Sidamo",
-        "sin": "Singhalesisch",
-        "slk": "Slowakisch",
-        "slv": "Slowenisch",
-        "sma": "Sami; Süd",
-        "sme": "Nordsamisch",
-        "smj": "Samisch (Lule)",
-        "smn": "Samisch; Inari",
-        "smo": "Samoanisch",
-        "sms": "Samisch; Skolt",
-        "sna": "Schona",
-        "snd": "Sindhi",
-        "snk": "Soninke",
-        "sog": "Sogdisch",
-        "som": "Somali",
-        "sot": "Sotho (Süd)",
-        "spa": "Spanisch; Kastilianisch",
-        "sqi": "Albanisch",
-        "srd": "Sardisch",
-        "srn": "Sranan Tongo",
-        "srp": "Serbisch",
-        "srr": "Serer",
-        "ssw": "Swazi",
-        "suk": "Sukuma",
-        "sun": "Sundanesisch",
-        "sus": "Susu",
-        "sux": "Sumerisch",
-        "swa": "Swahili (Makrosprache)",
-        "swe": "Schwedisch",
-        "syc": "Syrisch; Klassisch",
-        "syr": "Syrisch",
-        "tah": "Tahitisch",
-        "tam": "Tamilisch",
-        "tat": "Tatarisch",
-        "tel": "Telugu",
-        "tem": "Temne",
-        "ter": "Tereno",
-        "tet": "Tetum",
-        "tgk": "Tadschikisch",
-        "tgl": "Tagalog",
-        "tha": "Thailändisch",
-        "tig": "Tigre",
-        "tir": "Tigrinja",
-        "tiv": "Tiv",
-        "tkl": "Tokelauanisch",
-        "tlh": "Klingonisch",
-        "tli": "Tlingit",
-        "tmh": "Tamaseq",
-        "tog": "Tonga (Nyasa)",
-        "ton": "Tonga (Tonga-Inseln)",
-        "tpi": "Neumelanesisch; Pidgin",
-        "tsi": "Tsimshian",
-        "tsn": "Tswana",
-        "tso": "Tsonga",
-        "tuk": "Turkmenisch",
-        "tum": "Tumbuka",
-        "tur": "Türkisch",
-        "tvl": "Elliceanisch",
-        "twi": "Twi",
-        "tyv": "Tuwinisch",
-        "udm": "Udmurt",
-        "uga": "Ugaritisch",
-        "uig": "Uigurisch",
-        "ukr": "Ukrainisch",
-        "umb": "Mbundu; Umbundu",
-        "und": "Unbestimmbar",
-        "urd": "Urdu",
-        "uzb": "Usbekisch",
-        "vai": "Vai",
-        "ven": "Venda",
-        "vie": "Vietnamesisch",
-        "vol": "Volapük",
-        "vot": "Wotisch",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippinen)",
-        "was": "Washo",
-        "wln": "Wallonisch",
-        "wol": "Wolof",
-        "xal": "Kalmükisch",
-        "xho": "Xhosa",
-        "yao": "Yao",
-        "yap": "Yapesisch",
-        "yid": "Jiddisch",
-        "yor": "Joruba",
-        "zap": "Zapotekisch",
-        "zbl": "Bliss-Symbole",
-        "zen": "Zenaga",
-        "zha": "Zhuang",
-        "zho": "Chinesisch",
-        "zul": "Zulu",
-        "zun": "Zuni",
-        "zxx": "Kein sprachlicher Inhalt",
-        "zza": "Zaza"
-    },
     "ja": {
         "aar": "アファル語",
         "abk": "アブハジア語",
@@ -5427,6 +4167,1266 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
+    "nl": {
+        "aar": "Afar; Hamitisch",
+        "abk": "Abchazisch",
+        "ace": "Achinees",
+        "ach": "Acholi",
+        "ada": "Adangme",
+        "ady": "Adyghe",
+        "afh": "Afrihili",
+        "afr": "Afrikaans",
+        "ain": "Ainu (Japan)",
+        "aka": "Akaans",
+        "akk": "Akkadiaans",
+        "ale": "Aleut",
+        "alt": "Altajs; zuidelijk",
+        "amh": "Amhaars; Amharisch",
+        "ang": "Engels; oud (ca. 450-1100)",
+        "anp": "Angika",
+        "ara": "Arabisch",
+        "arc": "Aramees; officieel (700-300 B.C.)",
+        "arg": "Aragonees",
+        "arn": "Mapudungun",
+        "arp": "Arapaho",
+        "arw": "Arawak",
+        "asm": "Assamees; Assami",
+        "ast": "Asturisch",
+        "ava": "Avaars; Awari",
+        "ave": "Avestisch",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Azerbeidzjaans",
+        "bak": "Basjkiers; Basjkirisch",
+        "bal": "Balutsji; Baluchi",
+        "bam": "Bambara",
+        "ban": "Balinees",
+        "bas": "Basa (Kameroen)",
+        "bej": "Beja",
+        "bel": "Wit-Russisch; Belarussisch",
+        "bem": "Bemba (Zambia)",
+        "ben": "Bengaals",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "bin": "Bini; Edo",
+        "bis": "Bislama",
+        "bla": "Siksika",
+        "bod": "Tibetaans",
+        "bos": "Bosnisch",
+        "bra": "Braj",
+        "bre": "Bretons; Bretoens",
+        "bua": "Boeriaats",
+        "bug": "Buginees",
+        "bul": "Bulgaars",
+        "byn": "Bilin",
+        "cad": "Caddo",
+        "car": "Caribische talen",
+        "cat": "Catalaans",
+        "ceb": "Cebuano",
+        "ces": "Tsjechisch",
+        "cha": "Chamorro",
+        "chb": "Tsjibtsja",
+        "che": "Tsjetsjeens",
+        "chg": "Chagatai",
+        "chk": "Chukees",
+        "chm": "Mari (Rusland)",
+        "chn": "Chinook-jargon",
+        "cho": "Choctaw",
+        "chp": "Chipewyaans",
+        "chr": "Cherokee",
+        "chu": "Slavisch; oud (kerk)",
+        "chv": "Tsjoevasjisch",
+        "chy": "Cheyenne",
+        "cop": "Koptisch",
+        "cor": "Cornisch",
+        "cos": "Corsicaans",
+        "cre": "Cree",
+        "crh": "Turks; Crimean",
+        "csb": "Kasjoebiaans",
+        "cym": "Welsh",
+        "dak": "Dakota",
+        "dan": "Deens",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "den": "Slavisch (Athapascaans)",
+        "deu": "Duits",
+        "dgr": "Dogrib",
+        "din": "Dinka",
+        "div": "Divehi",
+        "doi": "Dogri",
+        "dsb": "Sorbisch; lager",
+        "dua": "Duala",
+        "dum": "Nederlands; middel (ca. 1050-1350)",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efikisch",
+        "egy": "Egyptisch (antiek)",
+        "eka": "Ekajuk",
+        "ell": "Grieks; Modern (1453-)",
+        "elx": "Elamitisch",
+        "eng": "Engels",
+        "enm": "Engels; middel (1100-1500)",
+        "epo": "Esperanto",
+        "est": "Estlands",
+        "eus": "Baskisch",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang",
+        "fao": "Faeröers",
+        "fas": "Perzisch",
+        "fat": "Fanti",
+        "fij": "Fijisch",
+        "fil": "Filipijns",
+        "fin": "Fins",
+        "fon": "Fon",
+        "fra": "Frans",
+        "frm": "Frans; middel (ca. 1400-1600)",
+        "fro": "Frans; oud (842-ca. 1400)",
+        "frr": "Fries; noordelijk (Duitsland)",
+        "frs": "Fries; oostelijk (Duitsland)",
+        "fry": "Fries",
+        "ful": "Fulah",
+        "fur": "Friulisch",
+        "gaa": "Ga",
+        "gay": "Gayo",
+        "gba": "Gbaya (Centraal Afrikaanse Republiek)",
+        "gez": "Ge'ez",
+        "gil": "Gilbertees",
+        "gla": "Keltisch; schots",
+        "gle": "Iers",
+        "glg": "Galiciaans",
+        "glv": "Manx",
+        "gmh": "Duits; middel hoog (ca. 1050-1500)",
+        "goh": "Duits; oud hoog (ca. 750-1050)",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "Gothisch",
+        "grb": "Grebo",
+        "grc": "Grieks; antiek (tot 1453)",
+        "grn": "Guarani",
+        "gsw": "Duits; Zwitserland",
+        "guj": "Gujarati",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hat": "Creools; Haïtiaans",
+        "hau": "Hausa",
+        "haw": "Hawaiiaans",
+        "heb": "Hebreeuws",
+        "her": "Herero",
+        "hil": "Hiligainoons",
+        "hin": "Hindi",
+        "hit": "Hittitisch",
+        "hmn": "Hmong",
+        "hmo": "Hiri Motu",
+        "hrv": "Kroatisch",
+        "hsb": "Servisch; hoger",
+        "hun": "Hongaars",
+        "hup": "Hupa",
+        "hye": "Armeens",
+        "iba": "Ibaans",
+        "ibo": "Igbo",
+        "ido": "Ido",
+        "iii": "Yi; Sichuan - Nuosu",
+        "iku": "Inuktitut",
+        "ile": "Interlingue",
+        "ilo": "Iloko",
+        "ina": "Interlingua (International Auxiliary Language Association)",
+        "ind": "Indonesisch",
+        "inh": "Ingoesjetisch",
+        "ipk": "Inupiak",
+        "isl": "IJslands",
+        "ita": "Italiaans",
+        "jav": "Javaans",
+        "jbo": "Lojbaans",
+        "jpn": "Japans",
+        "jpr": "Joods-Perzisch",
+        "jrb": "Joods-Arabisch",
+        "kaa": "Kara-Kalpak",
+        "kab": "Kabyle",
+        "kac": "Katsjin",
+        "kal": "Groenlands",
+        "kam": "Kamba (Kenya)",
+        "kan": "Kannada; Kanara; Kanarees",
+        "kas": "Kashmiri",
+        "kat": "Georgisch",
+        "kau": "Kanuri",
+        "kaw": "Kawi",
+        "kaz": "Kazachs",
+        "kbd": "Kabardisch; Tsjerkessisch",
+        "kha": "Khasi",
+        "khm": "Khmer, Cambodjaans",
+        "kho": "Khotanees",
+        "kik": "Kikuyu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirgizisch",
+        "kmb": "Kimbundu",
+        "kok": "Konkani",
+        "kom": "Komi",
+        "kon": "Kikongo",
+        "kor": "Koreaans",
+        "kos": "Kosraeaans",
+        "kpe": "Kpelle",
+        "krc": "Karatsjay-Balkar",
+        "krl": "Karelisch",
+        "kru": "Kurukh",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "Koerdisch",
+        "kut": "Kutenaïsch",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "Laotiaans",
+        "lat": "Latijn",
+        "lav": "Lets",
+        "lez": "Lezghiaans",
+        "lim": "Limburgs",
+        "lin": "Lingala",
+        "lit": "Litouws",
+        "lol": "Mongo",
+        "loz": "Lozi",
+        "ltz": "Luxemburgs",
+        "lua": "Luba-Lulua",
+        "lub": "Luba-Katanga",
+        "lug": "Luganda",
+        "lui": "Luiseno",
+        "lun": "Lunda",
+        "luo": "Luo (Kenia en Tanzania)",
+        "lus": "Lushai",
+        "mad": "Madurees",
+        "mag": "Magahisch",
+        "mah": "Marshallees",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mal": "Malayalam",
+        "man": "Mandingo",
+        "mar": "Marathi",
+        "mas": "Masai",
+        "mdf": "Moksja",
+        "mdr": "Mandars",
+        "men": "Mende",
+        "mga": "Iers; middel (900-1200)",
+        "mic": "Mi'kmaq; Micmac",
+        "min": "Minangkabau",
+        "mis": "Niet-gecodeerde talen",
+        "mkd": "Macedonisch",
+        "mlg": "Malagassisch",
+        "mlt": "Maltees",
+        "mnc": "Manchu",
+        "mni": "Manipuri",
+        "moh": "Mohawk",
+        "mon": "Mongools",
+        "mos": "Mossisch",
+        "mri": "Maori",
+        "msa": "Maleis",
+        "mul": "Meerdere talen",
+        "mus": "Creek",
+        "mwl": "Mirandees",
+        "mwr": "Marwari",
+        "mya": "Burmees",
+        "myv": "Erzya",
+        "nap": "Napolitaans",
+        "nau": "Nauruaans",
+        "nav": "Navajo",
+        "nbl": "Ndebele; zuid",
+        "nde": "Ndebele; noord",
+        "ndo": "Ndonga",
+        "nds": "Duits; Laag",
+        "nep": "Nepalees",
+        "new": "Newari; Nepal",
+        "nia": "Nias",
+        "niu": "Niueaans",
+        "nld": "Nederlands",
+        "nno": "Noors; Nynorsk",
+        "nob": "Noors; Bokmål",
+        "nog": "Nogai",
+        "non": "Noors; oud",
+        "nor": "Noors",
+        "nqo": "N'Ko",
+        "nso": "Pedi; Sepedi; Noord-Sothotisch",
+        "nwc": "Newari; Klassiek Nepal",
+        "nya": "Nyanja",
+        "nym": "Nyamwezi",
+        "nyn": "Nyankools",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitaans (na 1500)",
+        "oji": "Ojibwa",
+        "ori": "Oriya",
+        "orm": "Oromo",
+        "osa": "Osaags",
+        "oss": "Ossetisch",
+        "ota": "Turks; ottomaans (1500-1928)",
+        "pag": "Pangasinaans",
+        "pal": "Pehlevi",
+        "pam": "Pampanga",
+        "pan": "Punjabi",
+        "pap": "Papiamento",
+        "pau": "Palauaans",
+        "peo": "Perzisch; oud (ca. 600-400 B.C.)",
+        "phn": "Foenisisch",
+        "pli": "Pali",
+        "pol": "Pools",
+        "pon": "Pohnpeiaans",
+        "por": "Portugees",
+        "pro": "Provençaals; oud (tot 1500)",
+        "pus": "Poesjto",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "rar": "Rarotongan; Cookeilanden Maori",
+        "roh": "Reto-Romaans",
+        "rom": "Romani",
+        "ron": "Roemeens",
+        "run": "Rundi",
+        "rup": "Roemeens; Macedo-",
+        "rus": "Russisch",
+        "sad": "Sandawe",
+        "sag": "Sangho",
+        "sah": "Jakoets",
+        "sam": "Aramees; Samaritaans",
+        "san": "Sanskriet",
+        "sas": "Sasaaks",
+        "sat": "Santali",
+        "scn": "Siciliaans",
+        "sco": "Schots",
+        "sel": "Sulkoeps",
+        "sga": "Iers; oud (tot 900)",
+        "shn": "Sjaans",
+        "sid": "Sidamo",
+        "sin": "Sinhala",
+        "slk": "Slowaaks",
+        "slv": "Sloveens",
+        "sma": "Samisch; zuid, Laps; zuid",
+        "sme": "Samisch; noord, Laps; noord",
+        "smj": "Lule Sami",
+        "smn": "Sami; Inari, Laps; Inari",
+        "smo": "Samoaans",
+        "sms": "Sami; Skolt, Laps; Skolt",
+        "sna": "Shona",
+        "snd": "Sindhi",
+        "snk": "Soninke",
+        "sog": "Sogdiaans",
+        "som": "Somalisch",
+        "sot": "Sothaans; zuidelijk",
+        "spa": "Spaans",
+        "sqi": "Albanees",
+        "srd": "Sardinisch",
+        "srn": "Sranan Tongo",
+        "srp": "Servisch",
+        "srr": "Serer",
+        "ssw": "Swati",
+        "suk": "Sukuma",
+        "sun": "Soendanees; Sundanees",
+        "sus": "Susu",
+        "sux": "Sumerisch",
+        "swa": "Swahili",
+        "swe": "Zweeds",
+        "syc": "Syriac; Klassiek",
+        "syr": "Syrisch",
+        "tah": "Tahitisch",
+        "tam": "Tamil",
+        "tat": "Tataars",
+        "tel": "Telugu",
+        "tem": "Timne",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tgk": "Tadzjieks",
+        "tgl": "Tagalog",
+        "tha": "Thai",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tiv": "Tiv",
+        "tkl": "Tokelau",
+        "tlh": "Klingon; tlhIngan-Hol",
+        "tli": "Tlingit",
+        "tmh": "Tamasjek",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga-eilanden)",
+        "tpi": "Tok Pisin",
+        "tsi": "Tsimsjiaans",
+        "tsn": "Tswana",
+        "tso": "Tsonga",
+        "tuk": "Turkmeens",
+        "tum": "Tumbuka",
+        "tur": "Turks",
+        "tvl": "Tuvalu",
+        "twi": "Twi",
+        "tyv": "Tuviniaans",
+        "udm": "Udmurts",
+        "uga": "Ugaritisch",
+        "uig": "Oeigoers; Oejgoers",
+        "ukr": "Oekraïens",
+        "umb": "Umbundu",
+        "und": "Onbepaald",
+        "urd": "Urdu",
+        "uzb": "Oezbeeks",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Vietnamees",
+        "vol": "Volapük",
+        "vot": "Votisch",
+        "wal": "Walamo",
+        "war": "Waray (Filipijns)",
+        "was": "Wasjo",
+        "wln": "Waals",
+        "wol": "Wolof",
+        "xal": "Kalmyk",
+        "xho": "Xhosa",
+        "yao": "Yao",
+        "yap": "Yapees",
+        "yid": "Jiddisch",
+        "yor": "Yoruba",
+        "zap": "Zapotec",
+        "zbl": "Blissymbolen",
+        "zen": "Zenaga",
+        "zha": "Zhuang, Tsjoeang",
+        "zho": "Chinees",
+        "zul": "Zoeloe",
+        "zun": "Zuni",
+        "zxx": "Geen linguïstische inhoud",
+        "zza": "Zaza"
+    },
+    "pl": {
+        "aar": "afarski",
+        "abk": "abchaski",
+        "ace": "aczineski",
+        "ach": "aczoli",
+        "ada": "adangme",
+        "ady": "adygejski",
+        "afh": "afrihili",
+        "afr": "afrykanerski",
+        "ain": "ajnoski (Japonia)",
+        "aka": "akan",
+        "akk": "akadyjski",
+        "ale": "aleucki",
+        "alt": "ałtajski południowy",
+        "amh": "amharski",
+        "ang": "Staroangielski (ok. 450-1100)",
+        "anp": "angika",
+        "ara": "arabski",
+        "arc": "aramejski oficjalny (700-300 p.n.e.)",
+        "arg": "aragoński",
+        "arn": "araukański",
+        "arp": "arapaho",
+        "arw": "arawak",
+        "asm": "asamski",
+        "ast": "asturyjski",
+        "ava": "awarski",
+        "ave": "awestyjski",
+        "awa": "awadhi",
+        "aym": "ajmara",
+        "aze": "azerski",
+        "bak": "baszkirski",
+        "bal": "baluczi",
+        "bam": "bambara",
+        "ban": "balijski",
+        "bas": "basa (Kamerun)",
+        "bej": "bedża",
+        "bel": "białoruski",
+        "bem": "bemba (Zambia)",
+        "ben": "bengalski",
+        "bho": "bhodźpuri",
+        "bik": "bikol",
+        "bin": "edo",
+        "bis": "bislama",
+        "bla": "siksika",
+        "bod": "tybetański",
+        "bos": "bośniacki",
+        "bra": "bradź",
+        "bre": "bretoński",
+        "bua": "buriacki",
+        "bug": "bugijski",
+        "bul": "bułgarski",
+        "byn": "blin",
+        "cad": "kaddo",
+        "car": "karaibski galibi",
+        "cat": "kataloński",
+        "ceb": "cebuański",
+        "ces": "czeski",
+        "cha": "czamorro",
+        "chb": "czibcza",
+        "che": "czeczeński",
+        "chg": "czagatajski",
+        "chk": "chuuk",
+        "chm": "maryjski (Rosja)",
+        "chn": "żargon chinoocki",
+        "cho": "czoktaw",
+        "chp": "chipewyan",
+        "chr": "czerokeski",
+        "chu": "starosłowiański",
+        "chv": "czuwaski",
+        "chy": "czejeński",
+        "cop": "koptyjski",
+        "cor": "kornijski",
+        "cos": "korsykański",
+        "cre": "kri",
+        "crh": "krymskotatarski",
+        "csb": "kaszubski",
+        "cym": "walijski",
+        "dak": "dakota",
+        "dan": "duński",
+        "dar": "dargwijski",
+        "del": "delaware",
+        "den": "slavey (atapaskański)",
+        "deu": "niemiecki",
+        "dgr": "dogrib",
+        "din": "dinka",
+        "div": "malediwski; divehi",
+        "doi": "dogri (makrojęzyk)",
+        "dsb": "dolnołużycki",
+        "dua": "duala",
+        "dum": "holenderski średniowieczny (ok. 1050-1350)",
+        "dyu": "diula",
+        "dzo": "dzongka",
+        "efi": "efik",
+        "egy": "egipski (starożytny)",
+        "eka": "ekajuk",
+        "ell": "grecki współczesny (1453-)",
+        "elx": "elamicki",
+        "eng": "Angielski",
+        "enm": "angielski średniowieczny (1100-1500)",
+        "epo": "esperanto",
+        "est": "estoński",
+        "eus": "baskijski",
+        "ewe": "ewe",
+        "ewo": "ewondo",
+        "fan": "fang (Gwinea Równikowa)",
+        "fao": "farerski",
+        "fas": "perski",
+        "fat": "fanti",
+        "fij": "fidżyjski",
+        "fil": "pilipino",
+        "fin": "fiński",
+        "fon": "fon",
+        "fra": "francuski",
+        "frm": "francuski średniowieczny (ok. 1400-1600)",
+        "fro": "starofrancuski (842-ok. 1400)",
+        "frr": "północnofryzyjski",
+        "frs": "wschodniofryzyjski",
+        "fry": "zachodniofryzyjski",
+        "ful": "fulani",
+        "fur": "friulski",
+        "gaa": "ga",
+        "gay": "gayo",
+        "gba": "gbaya (Republika Środkowoafrykańska)",
+        "gez": "gyyz",
+        "gil": "gilbertański",
+        "gla": "szkocki gaelicki",
+        "gle": "irlandzki",
+        "glg": "galicyjski",
+        "glv": "manx",
+        "gmh": "średnio-wysoko-niemiecki (ok. 1050-1500)",
+        "goh": "staro-wysoko-niemiecki (ok. 750-1050)",
+        "gon": "gondi",
+        "gor": "gorontalo",
+        "got": "gocki",
+        "grb": "grebo",
+        "grc": "grecki starożytny (do 1453)",
+        "grn": "guarani",
+        "gsw": "niemiecki szwajcarski",
+        "guj": "gudźarati",
+        "gwi": "gwichʼin",
+        "hai": "haida",
+        "hat": "kreolski haitański",
+        "hau": "hausa",
+        "haw": "hawajski",
+        "heb": "hebrajski",
+        "her": "herero",
+        "hil": "hiligajnon",
+        "hin": "hindi",
+        "hit": "hetycki",
+        "hmn": "hmong",
+        "hmo": "hiri motu",
+        "hrv": "chorwacki",
+        "hsb": "górnołużycki",
+        "hun": "węgierski",
+        "hup": "hupa",
+        "hye": "ormiański",
+        "iba": "ibanag",
+        "ibo": "ibo",
+        "ido": "ido",
+        "iii": "syczuański",
+        "iku": "inuktitut",
+        "ile": "interlingue",
+        "ilo": "ilokano",
+        "ina": "interlingua (Międzynarodowe Stowarzyszenie Języka Pomocniczego)",
+        "ind": "indonezyjski",
+        "inh": "inguski",
+        "ipk": "inupiaq",
+        "isl": "islandzki",
+        "ita": "włoski",
+        "jav": "jawajski",
+        "jbo": "lojban",
+        "jpn": "japoński",
+        "jpr": "judeo-perski",
+        "jrb": "judeoarabski",
+        "kaa": "karakałpacki",
+        "kab": "kabylski",
+        "kac": "kaczin",
+        "kal": "kalaallisut",
+        "kam": "kamba (Kenia)",
+        "kan": "kannada",
+        "kas": "kaszmirski",
+        "kat": "gruziński",
+        "kau": "kanuri",
+        "kaw": "kawi",
+        "kaz": "kazaski",
+        "kbd": "kabardyjski",
+        "kha": "khasi",
+        "khm": "środkowokhmerski",
+        "kho": "chotański",
+        "kik": "kikiju",
+        "kin": "ruanda",
+        "kir": "kirgiski",
+        "kmb": "kimbundu",
+        "kok": "konkani (makrojęzyk)",
+        "kom": "komi",
+        "kon": "kongo",
+        "kor": "koreański",
+        "kos": "kosrae",
+        "kpe": "kpelle",
+        "krc": "karaczajsko-bałkarski",
+        "krl": "karelski",
+        "kru": "kurukh",
+        "kua": "kwanyama",
+        "kum": "kumycki",
+        "kur": "kurdyjski",
+        "kut": "kutenai",
+        "lad": "ladino",
+        "lah": "lahnda",
+        "lam": "lamba",
+        "lao": "laotański",
+        "lat": "łaciński",
+        "lav": "łotewski",
+        "lez": "lezgiński",
+        "lim": "limburgijski",
+        "lin": "lingala",
+        "lit": "litewski",
+        "lol": "mongo",
+        "loz": "lozi",
+        "ltz": "luksemburski",
+        "lua": "luba-lulua",
+        "lub": "luba-katanga",
+        "lug": "luganda",
+        "lui": "luiseno",
+        "lun": "lunda",
+        "luo": "luo (Kenia i Tanzania)",
+        "lus": "lushai",
+        "mad": "madurajski",
+        "mag": "magahi",
+        "mah": "marshalski",
+        "mai": "maithili",
+        "mak": "makasar",
+        "mal": "malajalam",
+        "man": "mandingo",
+        "mar": "marathi",
+        "mas": "masajski",
+        "mdf": "moksza",
+        "mdr": "mandar",
+        "men": "mende (Sierra Leone)",
+        "mga": "irlandzki średniowieczny (900-1200)",
+        "mic": "micmac",
+        "min": "minangkabau",
+        "mis": "języki niezakodowane",
+        "mkd": "macedoński",
+        "mlg": "malgaski",
+        "mlt": "maltański",
+        "mnc": "mandżurski",
+        "mni": "manipuri",
+        "moh": "mohawk",
+        "mon": "mongolski",
+        "mos": "mossi",
+        "mri": "maoryski",
+        "msa": "malajski (makrojęzyk)",
+        "mul": "wiele języków",
+        "mus": "krik",
+        "mwl": "mirandyjski",
+        "mwr": "marwari",
+        "mya": "birmański",
+        "myv": "erzja",
+        "nap": "neapolitański",
+        "nau": "nauruański",
+        "nav": "navaho",
+        "nbl": "ndebele południowy",
+        "nde": "ndebele północny",
+        "ndo": "ndonga",
+        "nds": "German; Low",
+        "nep": "nepalski",
+        "new": "newarski",
+        "nia": "nias",
+        "niu": "niue",
+        "nld": "holenderski",
+        "nno": "norweski Nynorsk",
+        "nob": "norweski Bokmål",
+        "nog": "nogajski",
+        "non": "staronordyjski",
+        "nor": "norweski",
+        "nqo": "n’ko",
+        "nso": "sotho północny",
+        "nwc": "newarski klasyczny",
+        "nya": "njandża",
+        "nym": "nyamwezi",
+        "nyn": "nyankole",
+        "nyo": "nyoro",
+        "nzi": "nzema",
+        "oci": "okcytański (po 1500)",
+        "oji": "odżibwe",
+        "ori": "orija",
+        "orm": "oromo",
+        "osa": "osage",
+        "oss": "osetyjski",
+        "ota": "turecki otomański (1500-1928)",
+        "pag": "pangasino",
+        "pal": "pahlawi",
+        "pam": "pampango",
+        "pan": "pendżabski",
+        "pap": "papiamento",
+        "pau": "palau",
+        "peo": "staroperski (ok. 600-400 p.n.e)",
+        "phn": "fenicki",
+        "pli": "pali",
+        "pol": "Polski",
+        "pon": "pohnpei",
+        "por": "portugalski",
+        "pro": "prowansalski średniowieczny (do 1500)",
+        "pus": "paszto",
+        "que": "keczua",
+        "raj": "radźasthani",
+        "rap": "rapanui",
+        "rar": "maoryski Wysp Cooka",
+        "roh": "retoromański",
+        "rom": "romski",
+        "ron": "rumuński",
+        "run": "rundi",
+        "rup": "arumuński",
+        "rus": "rosyjski",
+        "sad": "sandawe",
+        "sag": "sango",
+        "sah": "jakucki",
+        "sam": "samarytański aramejski",
+        "san": "sanskryt",
+        "sas": "sasak",
+        "sat": "santali",
+        "scn": "sycylijski",
+        "sco": "scots",
+        "sel": "selkupski",
+        "sga": "staroirlandzki (do 900)",
+        "shn": "szan",
+        "sid": "sidamo",
+        "sin": "syngaleski",
+        "slk": "słowacki",
+        "slv": "słoweński",
+        "sma": "południowolapoński",
+        "sme": "północnolapoński",
+        "smj": "lapoński lule",
+        "smn": "lapoński inari",
+        "smo": "samoański",
+        "sms": "lapoński skolt",
+        "sna": "shona",
+        "snd": "sindhi",
+        "snk": "soninke",
+        "sog": "sogdiański",
+        "som": "somalijski",
+        "sot": "sotho południowy",
+        "spa": "hiszpański",
+        "sqi": "albański",
+        "srd": "sardyński",
+        "srn": "sranan tongo",
+        "srp": "serbski",
+        "srr": "serer",
+        "ssw": "suazi",
+        "suk": "sukuma",
+        "sun": "sundajski",
+        "sus": "susu",
+        "sux": "sumeryjski",
+        "swa": "suahili (makrojęzyk)",
+        "swe": "szwedzki",
+        "syc": "syryjski klasyczny",
+        "syr": "syryjski",
+        "tah": "tahitański",
+        "tam": "tamilski",
+        "tat": "tatarski",
+        "tel": "telugu",
+        "tem": "temne",
+        "ter": "tereno",
+        "tet": "tetum",
+        "tgk": "tadżycki",
+        "tgl": "tagalski",
+        "tha": "tajski",
+        "tig": "tigre",
+        "tir": "tigrinia",
+        "tiv": "tiw",
+        "tkl": "tokelau",
+        "tlh": "klingoński",
+        "tli": "tlingit",
+        "tmh": "tuareski",
+        "tog": "tongański (Nyasa)",
+        "ton": "tongański (Wyspy Tonga)",
+        "tpi": "tok pisin",
+        "tsi": "tsimszian",
+        "tsn": "tswana",
+        "tso": "tsonga",
+        "tuk": "turkmeński",
+        "tum": "tumbuka",
+        "tur": "turecki",
+        "tvl": "tuvalu",
+        "twi": "twi",
+        "tyv": "tuwiński",
+        "udm": "udmurcki",
+        "uga": "ugarycki",
+        "uig": "ujgurski",
+        "ukr": "ukraiński",
+        "umb": "umbundu",
+        "und": "nieokreślony",
+        "urd": "urdu",
+        "uzb": "uzbecki",
+        "vai": "wai",
+        "ven": "venda",
+        "vie": "wietnamski",
+        "vol": "wolapik",
+        "vot": "wotycki",
+        "wal": "walamo",
+        "war": "warajski (Filipiny)",
+        "was": "washo",
+        "wln": "waloński",
+        "wol": "wolof",
+        "xal": "kałmucki",
+        "xho": "xhosa",
+        "yao": "yao",
+        "yap": "japski",
+        "yid": "jidysz",
+        "yor": "joruba",
+        "zap": "zapotecki",
+        "zbl": "bliss",
+        "zen": "zenaga",
+        "zha": "zhuang",
+        "zho": "chiński",
+        "zul": "zuluski",
+        "zun": "zuni",
+        "zxx": "brak kontekstu językowego",
+        "zza": "zazaki"
+    },
+    "ru": {
+        "aar": "Афар",
+        "abk": "Абхазский",
+        "ace": "Ачехский",
+        "ach": "Ачоли",
+        "ada": "Адангме",
+        "ady": "Адыгейский",
+        "afh": "Африхили",
+        "afr": "Африкаанс",
+        "ain": "Ainu (Japan)",
+        "aka": "Акан",
+        "akk": "Аккадский",
+        "ale": "Алеутский",
+        "alt": "Altai; Southern",
+        "amh": "Амхарский (Амаринья)",
+        "ang": "English; Old (ca. 450-1100)",
+        "anp": "Анжика",
+        "ara": "Арабский",
+        "arc": "Арамейский; Официальный",
+        "arg": "Арагонский",
+        "arn": "Mapudungun",
+        "arp": "Арапахо",
+        "arw": "Аравакский",
+        "asm": "Ассамский",
+        "ast": "Астурийский",
+        "ava": "Аварский",
+        "ave": "Авестийский",
+        "awa": "Авадхи",
+        "aym": "Аймара",
+        "aze": "Азербайджанский",
+        "bak": "Башкирский",
+        "bal": "Baluchi",
+        "bam": "Бамбара",
+        "ban": "Балийский",
+        "bas": "Баса (Камерун)",
+        "bej": "Беджа",
+        "bel": "Белорусский",
+        "bem": "Бемба (Замбия)",
+        "ben": "Бенгальский",
+        "bho": "Бходжпури",
+        "bik": "Бикольский",
+        "bin": "Бини",
+        "bis": "Бислама",
+        "bla": "Сиксика",
+        "bod": "Тибетский",
+        "bos": "Боснийский",
+        "bra": "Браун",
+        "bre": "Бретонский",
+        "bua": "Бурятский",
+        "bug": "Бугийский",
+        "bul": "Болгарский",
+        "byn": "Bilin",
+        "cad": "Каддо",
+        "car": "Carib; Galibi",
+        "cat": "Каталанский",
+        "ceb": "Себуано",
+        "ces": "Чешский",
+        "cha": "Чаморро",
+        "chb": "Чибча",
+        "che": "Чеченский",
+        "chg": "Чагатайский",
+        "chk": "Трукский",
+        "chm": "Марийский (Россия)",
+        "chn": "Чинук жаргон",
+        "cho": "Чоктав",
+        "chp": "Чипевианский",
+        "chr": "Чероки",
+        "chu": "Slavonic; Old",
+        "chv": "Чувашский",
+        "chy": "Чейенн",
+        "cop": "Коптский",
+        "cor": "Корнский",
+        "cos": "Корсиканский",
+        "cre": "Кри",
+        "crh": "Turkish; Crimean",
+        "csb": "Кашубианский",
+        "cym": "Уэльский (Валлийский)",
+        "dak": "Дакота",
+        "dan": "Датский",
+        "dar": "Даргва",
+        "del": "Делаварский",
+        "den": "Атапачские языки",
+        "deu": "Немецкий",
+        "dgr": "Догриб",
+        "din": "Динка",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolanguage)",
+        "dsb": "Sorbian; Lower",
+        "dua": "Дуала",
+        "dum": "Dutch; Middle (ca. 1050-1350)",
+        "dyu": "Диула (Дьюла)",
+        "dzo": "Дзонг-кэ",
+        "efi": "Эфик",
+        "egy": "Древнеегипетский",
+        "eka": "Экаджук",
+        "ell": "Новогреческий (с 1453)",
+        "elx": "Эламский",
+        "eng": "Английский",
+        "enm": "Среднеанглийский (1100-1500)",
+        "epo": "Эсперанто",
+        "est": "Эстонский",
+        "eus": "Баскский",
+        "ewe": "Эве",
+        "ewo": "Эвондо",
+        "fan": "Fang (Equatorial Guinea)",
+        "fao": "Фарерский",
+        "fas": "Персидский",
+        "fat": "Фанти",
+        "fij": "Фиджийский",
+        "fil": "Filipino",
+        "fin": "Финский",
+        "fon": "Фон",
+        "fra": "Французский",
+        "frm": "French; Middle (ca. 1400-1600)",
+        "fro": "French; Old (842-ca. 1400)",
+        "frr": "Frisian; Northern",
+        "frs": "Frisian; Eastern",
+        "fry": "Frisian; Western",
+        "ful": "Фулах",
+        "fur": "Фриулианский",
+        "gaa": "Га",
+        "gay": "Гайо",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "Геэз",
+        "gil": "Гильбертский",
+        "gla": "Gaelic; Scottish",
+        "gle": "Ирландский",
+        "glg": "Galician",
+        "glv": "Мэнкский",
+        "gmh": "German; Middle High (ca. 1050-1500)",
+        "goh": "German; Old High (ca. 750-1050)",
+        "gon": "Гонди",
+        "gor": "Горонтало",
+        "got": "Готский",
+        "grb": "Гребо",
+        "grc": "Древнегреческий (по 1453)",
+        "grn": "Гуарани",
+        "gsw": "German; Swiss",
+        "guj": "Гуджарати",
+        "gwi": "Gwichʼin",
+        "hai": "Хайда",
+        "hat": "Creole; Haitian",
+        "hau": "Хауса",
+        "haw": "Гавайский",
+        "heb": "Иврит",
+        "her": "Гереро",
+        "hil": "Хилигайнон",
+        "hin": "Хинди",
+        "hit": "Хиттит",
+        "hmn": "Хмонг",
+        "hmo": "Хири Моту",
+        "hrv": "Хорватский",
+        "hsb": "Sorbian; Upper",
+        "hun": "Венгерский",
+        "hup": "Хупа",
+        "hye": "Армянский",
+        "iba": "Ибанский",
+        "ibo": "Игбо",
+        "ido": "Идо",
+        "iii": "Yi; Sichuan",
+        "iku": "Инуктитут",
+        "ile": "Интерлингве",
+        "ilo": "Илоко",
+        "ina": "Интерлингва (Ассоциация международного вспомогательного языка)",
+        "ind": "Индонезийский",
+        "inh": "Ингушский",
+        "ipk": "Инулиак",
+        "isl": "Исландский",
+        "ita": "Итальянский",
+        "jav": "Яванский",
+        "jbo": "Лоджбан",
+        "jpn": "Японский",
+        "jpr": "Еврейско-персидский",
+        "jrb": "Еврейско-арабский",
+        "kaa": "Каракалпакский",
+        "kab": "Кабильский",
+        "kac": "Качинский",
+        "kal": "Kalaallisut",
+        "kam": "Kamba (Kenya)",
+        "kan": "Каннада",
+        "kas": "Кашмири",
+        "kat": "Грузинский",
+        "kau": "Канури",
+        "kaw": "Кави",
+        "kaz": "Казахский",
+        "kbd": "Кабардинский",
+        "kha": "Кхаси",
+        "khm": "Khmer; Central",
+        "kho": "Хотанский",
+        "kik": "Кикуйю",
+        "kin": "Киньяруанда",
+        "kir": "Киргизский",
+        "kmb": "Кимбунду",
+        "kok": "Konkani (macrolanguage)",
+        "kom": "Коми",
+        "kon": "Конго",
+        "kor": "Корейский",
+        "kos": "Косраинский",
+        "kpe": "Кпелле",
+        "krc": "Карачаево-балкарский",
+        "krl": "Карельский",
+        "kru": "Курух",
+        "kua": "Киньяма",
+        "kum": "Кумыкский",
+        "kur": "Курдский",
+        "kut": "Кутенаи",
+        "lad": "Ладино",
+        "lah": "Лахнда",
+        "lam": "Ламба",
+        "lao": "Лаосский",
+        "lat": "Латинский",
+        "lav": "Латвийский",
+        "lez": "Лезгинский",
+        "lim": "Limburgan",
+        "lin": "Лингала",
+        "lit": "Литовский",
+        "lol": "Монго",
+        "loz": "Лози",
+        "ltz": "Luxembourgish",
+        "lua": "Луба-Лулуа",
+        "lub": "Луба-Катанга",
+        "lug": "Ганда",
+        "lui": "Луисеньо",
+        "lun": "Лунда",
+        "luo": "Луо (Кения и Танзания)",
+        "lus": "Лушай",
+        "mad": "Мадурский",
+        "mag": "Магахи",
+        "mah": "Marshallese",
+        "mai": "Майтхили",
+        "mak": "Макассарский",
+        "mal": "Малаялам",
+        "man": "Мандинго",
+        "mar": "Маратхи",
+        "mas": "Масаи",
+        "mdf": "Мокшанский",
+        "mdr": "Мандарский",
+        "men": "Mende (Sierra Leone)",
+        "mga": "Среднеирландский (900-1200)",
+        "mic": "Mi'kmaq",
+        "min": "Минангкабау",
+        "mis": "Uncoded languages",
+        "mkd": "Македонский",
+        "mlg": "Малагаси",
+        "mlt": "Мальтийский",
+        "mnc": "Манчу",
+        "mni": "Манипури",
+        "moh": "Мохаук",
+        "mon": "Монгольский",
+        "mos": "Моей",
+        "mri": "Маори",
+        "msa": "Malay (macrolanguage)",
+        "mul": "Разных семей языки",
+        "mus": "Крик",
+        "mwl": "Мирандские",
+        "mwr": "Марвари",
+        "mya": "Бирманский",
+        "myv": "Эрзянский",
+        "nap": "Неаполитанский",
+        "nau": "Науру",
+        "nav": "Navajo",
+        "nbl": "Ндебеле южный",
+        "nde": "Ндебеле северный",
+        "ndo": "Ндунга",
+        "nds": "German; Low",
+        "nep": "Непальский",
+        "new": "Bhasa; Nepal",
+        "nia": "Ниас",
+        "niu": "Ниуэ",
+        "nld": "Нидерландский",
+        "nno": "Норвежский Нюнорск",
+        "nob": "Norwegian Bokmål",
+        "nog": "Ногайский",
+        "non": "Старонорвежский",
+        "nor": "Норвежский",
+        "nqo": "Н'ко",
+        "nso": "Sotho; Northern",
+        "nwc": "Newari; Old",
+        "nya": "Nyanja",
+        "nym": "Ньямвези",
+        "nyn": "Ньянколе",
+        "nyo": "Ньоро",
+        "nzi": "Нзима",
+        "oci": "Occitan (post 1500)",
+        "oji": "Оджибва",
+        "ori": "Ория",
+        "orm": "Оромо",
+        "osa": "Оседжи",
+        "oss": "Ossetian",
+        "ota": "Турецкий; Отомангский (1500-1928)",
+        "pag": "Пангасинан",
+        "pal": "Пехлевийский",
+        "pam": "Пампанга",
+        "pan": "Panjabi",
+        "pap": "Папьяменто",
+        "pau": "Палау",
+        "peo": "Persian; Old (ca. 600-400 B.C.)",
+        "phn": "Финикийский",
+        "pli": "Пали",
+        "pol": "Польский",
+        "pon": "Фонпейский",
+        "por": "Португальский",
+        "pro": "Старопровансальский (по 1500)",
+        "pus": "Пушту",
+        "que": "Кечуа",
+        "raj": "Раджастхани",
+        "rap": "Рапаню",
+        "rar": "Maori; Cook Islands",
+        "roh": "Romansh",
+        "rom": "Цыганский",
+        "ron": "Румынский",
+        "run": "Рунди",
+        "rup": "Romanian; Macedo-",
+        "rus": "Русский",
+        "sad": "Сандаве",
+        "sag": "Санго",
+        "sah": "Якутский",
+        "sam": "Aramaic; Samaritan",
+        "san": "Санскрит",
+        "sas": "Сасакский",
+        "sat": "Сантали",
+        "scn": "Сицилийский",
+        "sco": "Шотландский",
+        "sel": "Селкапский",
+        "sga": "Староирландский (по 900)",
+        "shn": "Шанский",
+        "sid": "Сидама",
+        "sin": "Сингальский",
+        "slk": "Словацкий",
+        "slv": "Словенский",
+        "sma": "Sami; Southern",
+        "sme": "Sami; Northern",
+        "smj": "Люле-саамский",
+        "smn": "Sami; Inari",
+        "smo": "Самоанский",
+        "sms": "Sami; Skolt",
+        "sna": "Шона",
+        "snd": "Синдхи",
+        "snk": "Сонинк",
+        "sog": "Согдийский",
+        "som": "Сомали",
+        "sot": "Сото Южный",
+        "spa": "Испанский",
+        "sqi": "Албанский",
+        "srd": "Сардинский",
+        "srn": "Sranan Tongo",
+        "srp": "Сербский",
+        "srr": "Серер",
+        "ssw": "Свати",
+        "suk": "Сукума",
+        "sun": "Сунданский",
+        "sus": "Сусу",
+        "sux": "Шумерский",
+        "swa": "Swahili (macrolanguage)",
+        "swe": "Шведский",
+        "syc": "Syriac; Classical",
+        "syr": "Сирийский",
+        "tah": "Таитянский",
+        "tam": "Тамильский",
+        "tat": "Татарский",
+        "tel": "Телугу",
+        "tem": "Темне",
+        "ter": "Терено",
+        "tet": "Тетумский",
+        "tgk": "Таджикский",
+        "tgl": "Тагалог",
+        "tha": "Таи",
+        "tig": "Тигре",
+        "tir": "Тигринья",
+        "tiv": "Тив",
+        "tkl": "Токелау",
+        "tlh": "Klingon",
+        "tli": "Тлингит",
+        "tmh": "Тамашек",
+        "tog": "Тонга (Ньяса)",
+        "ton": "Тонга (острова Тонга)",
+        "tpi": "Ток Писин",
+        "tsi": "Цимшиан",
+        "tsn": "Тсвана",
+        "tso": "Тсонга",
+        "tuk": "Туркменский",
+        "tum": "Тумбука",
+        "tur": "Турецкий",
+        "tvl": "Тувалу",
+        "twi": "Тви",
+        "tyv": "Тувинский",
+        "udm": "Удмуртский",
+        "uga": "Угаритский",
+        "uig": "Уйгурский",
+        "ukr": "Украинский",
+        "umb": "Умбунду",
+        "und": "Неидентифицированный",
+        "urd": "Урду",
+        "uzb": "Узбекский",
+        "vai": "Ваи",
+        "ven": "Венда",
+        "vie": "Вьетнамский",
+        "vol": "Волапюк",
+        "vot": "Вотик",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippines)",
+        "was": "Вашо",
+        "wln": "Валлун",
+        "wol": "Волоф",
+        "xal": "Kalmyk",
+        "xho": "Коса",
+        "yao": "Яо",
+        "yap": "Яапийский",
+        "yid": "Идиш",
+        "yor": "Йоруба",
+        "zap": "Сапотекский",
+        "zbl": "Blissymbols",
+        "zen": "Зенагский",
+        "zha": "Чжуанский",
+        "zho": "Китайский",
+        "zul": "Зулусский",
+        "zun": "Зуньи",
+        "zxx": "Нет языкового содержимого",
+        "zza": "Зазаки"
+    },
     "sv": {
         "aar": "Afar",
         "abk": "Abchaziska",
@@ -5847,845 +5847,1218 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
-    "cs": {
-        "aar": "afarština",
-        "abk": "abchazajština",
-        "ace": "atěžština",
-        "ach": "ačoli (luoština)",
-        "ada": "adangmeština",
-        "ady": "adyghe",
-        "afh": "afrihilijština",
-        "afr": "afrikánština",
-        "ain": "ainu (Japonsko)",
-        "aka": "akanština",
-        "akk": "akkadština",
-        "ale": "aleutština",
-        "alt": "altajština; jižní",
-        "amh": "Amharština",
-        "ang": "Angličtina; stará (asi 450-1100)",
-        "anp": "angika",
-        "ara": "arabština",
-        "arc": "aramejština; oficiální (700-300 př. n. l.)",
-        "arg": "aragonská španělština",
-        "arn": "mapudungun",
-        "arp": "arapaho",
-        "arw": "arawacké jazyky",
-        "asm": "ásámština",
-        "ast": "asturština",
-        "ava": "avarština",
-        "ave": "avestština",
-        "awa": "avadhština (avadhí)",
-        "aym": "aymarština",
-        "aze": "azerbajdžánština",
-        "bak": "Baskirština",
-        "bal": "balúčština",
-        "bam": "bambarština",
-        "ban": "balijština",
-        "bas": "basa (Kamerun)",
-        "bej": "bedža",
-        "bel": "běloruština",
-        "bem": "bemba (Zambie)",
-        "ben": "bengálština",
-        "bho": "bhódžpurština",
-        "bik": "bikolština",
-        "bin": "bini",
-        "bis": "bislamština",
-        "bla": "siksika",
-        "bod": "tibetština",
-        "bos": "bosenština",
-        "bra": "bradžština",
-        "bre": "bretonština",
-        "bua": "burjatština",
-        "bug": "bugiština",
-        "bul": "bulharština",
-        "byn": "bilin",
-        "cad": "caddo",
-        "car": "carib; Galibi",
-        "cat": "katalánština",
-        "ceb": "cebuánština",
-        "ces": "Čeština",
-        "cha": "čamoro",
-        "chb": "čibča",
-        "che": "čečenština",
-        "chg": "Chagatai",
-        "chk": "čukčtina",
-        "chm": "Mari (Russia)",
-        "chn": "činuk pidžin",
-        "cho": "choctawština",
-        "chp": "čipeva",
-        "chr": "čerokézština",
-        "chu": "Slavonic; Old",
-        "chv": "čuvaština",
-        "chy": "čejenština",
-        "cop": "koptština",
-        "cor": "kornština",
-        "cos": "korsičtina",
-        "cre": "krí",
-        "crh": "Turkish; Crimean",
-        "csb": "kašubština",
-        "cym": "velština",
-        "dak": "dakotština",
-        "dan": "dánština",
-        "dar": "dargwa",
-        "del": "delawarština",
-        "den": "atabaské jazyky",
-        "deu": "Němčina",
-        "dgr": "dogrib",
-        "din": "dinkština",
-        "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "Sorbian; Lower",
-        "dua": "dualština",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "djula",
-        "dzo": "Bhútánština",
-        "efi": "efik",
-        "egy": "egyptština (starověká)",
-        "eka": "ekajuk",
-        "ell": "řečtina; moderní (1453-)",
-        "elx": "elamština",
-        "eng": "Angličtina",
-        "enm": "Angličtina; středověká (1100-1500)",
-        "epo": "esperanto",
-        "est": "estonština",
-        "eus": "baskičtina",
-        "ewe": "eweština",
-        "ewo": "ewondo",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "faerština",
-        "fas": "perština",
-        "fat": "fantiština",
-        "fij": "Fidži",
-        "fil": "Filipino",
-        "fin": "finština",
-        "fon": "fonština",
-        "fra": "francouzština",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "fulahština",
-        "fur": "furlanština",
-        "gaa": "ga",
-        "gay": "gayo",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "etiopština",
-        "gil": "kiribatština",
-        "gla": "Gaelic; Scottish",
-        "gle": "irština",
-        "glg": "Galician",
-        "glv": "manština",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "góndština",
-        "gor": "gorontalo",
-        "got": "gótština",
-        "grb": "grebo",
-        "grc": "řečtina; starověká (do 1453)",
-        "grn": "Guaranština",
-        "gsw": "German; Swiss",
-        "guj": "Gudžarátština",
-        "gwi": "Gwichʼin",
-        "hai": "haida",
-        "hat": "Creole; Haitian",
-        "hau": "Hausa",
-        "haw": "havajština",
-        "heb": "hebrejština",
-        "her": "herero",
-        "hil": "hiligayonština",
-        "hin": "hindština",
-        "hit": "chetitština",
-        "hmn": "hmongština",
-        "hmo": "hiri motu",
-        "hrv": "chorvatština",
-        "hsb": "Sorbian; Upper",
-        "hun": "maďarština",
-        "hup": "hupa",
-        "hye": "arménština",
-        "iba": "iban",
-        "ibo": "igbo",
-        "ido": "ido",
-        "iii": "Yi; Sichuan",
-        "iku": "Inuktitutština",
-        "ile": "Interlingue",
-        "ilo": "ilokánština",
-        "ina": "Interlingua (Mezinárodní pomocná jazyková asociace)",
-        "ind": "indonézština",
-        "inh": "inguština",
-        "ipk": "Inupiakština",
-        "isl": "islandština",
-        "ita": "italština",
-        "jav": "jávština",
-        "jbo": "lojban",
-        "jpn": "japonština",
-        "jpr": "judeo-perština",
-        "jrb": "judeo-arabština",
-        "kaa": "karakalpačtina",
-        "kab": "kabulí",
-        "kac": "kačjinština",
-        "kal": "Kalaallisut",
-        "kam": "Kamba (Kenya)",
-        "kan": "Kannadština",
-        "kas": "kašmírština",
-        "kat": "Gruzínština",
-        "kau": "kanuri",
-        "kaw": "kawi",
-        "kaz": "Kazachština",
-        "kbd": "kabardština",
-        "kha": "Khasi",
-        "khm": "Khmer; Central",
-        "kho": "chotánština",
-        "kik": "Kikuyu",
-        "kin": "Kinyarwandština",
-        "kir": "Kirgizština",
-        "kmb": "kimbundština",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "komijština",
-        "kon": "Kongo",
-        "kor": "korejština",
-        "kos": "kosrajština",
-        "kpe": "kpelle",
-        "krc": "karachay-balkarština",
-        "krl": "karelština",
-        "kru": "kurukh",
-        "kua": "Kuanyama",
-        "kum": "kumyčtina",
-        "kur": "kurdština",
-        "kut": "kutenai",
-        "lad": "ladino",
-        "lah": "lahnda",
-        "lam": "lambština",
-        "lao": "Laoština",
-        "lat": "latina",
-        "lav": "Latvian",
-        "lez": "lezgiština",
-        "lim": "Limburgan",
-        "lin": "Ngalština",
-        "lit": "litevština",
-        "lol": "mongština",
-        "loz": "lozština",
-        "ltz": "Luxembourgish",
-        "lua": "luba-luluaština",
-        "lub": "lubu-katanžština",
-        "lug": "Ganda",
-        "lui": "luiseňo",
-        "lun": "lundština",
-        "luo": "luoština (Keňa a Tanzanie)",
-        "lus": "lušáí",
-        "mad": "madurština",
-        "mag": "magahština",
-        "mah": "Marshallese",
-        "mai": "maithilština",
-        "mak": "makasarština",
-        "mal": "Malabarština",
-        "man": "mandingština",
-        "mar": "maráthština",
-        "mas": "masajština",
-        "mdf": "moksha",
-        "mdr": "mandarínština",
-        "men": "Mende (Sierra Leone)",
-        "mga": "irština; středověká (900-1200)",
-        "mic": "Mi'kmaq",
-        "min": "minangkabau",
-        "mis": "Uncoded languages",
-        "mkd": "makedonština",
-        "mlg": "Malgaština",
-        "mlt": "maltézština",
-        "mnc": "manchu",
-        "mni": "manipurština",
-        "moh": "mohawk",
-        "mon": "mongolština",
-        "mos": "mosi",
-        "mri": "maorština",
-        "msa": "Malay (macrolanguage)",
-        "mul": "násobné jazyky",
-        "mus": "krík",
-        "mwl": "mirandština",
-        "mwr": "márvárština",
-        "mya": "Barmština",
-        "myv": "erzya",
-        "nap": "neapolština",
-        "nau": "naurština",
-        "nav": "navažština",
-        "nbl": "Ndebele; South",
-        "nde": "Ndebele; North",
-        "ndo": "ndondština",
-        "nds": "German; Low",
-        "nep": "nepálština",
-        "new": "Bhasa; Nepal",
-        "nia": "nias",
-        "niu": "niue",
-        "nld": "holandština",
-        "nno": "Norwegian Nynorsk",
-        "nob": "Norwegian Bokmål",
-        "nog": "nogai",
-        "non": "norština; stará",
-        "nor": "norština",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
-        "nym": "ňamwežština",
-        "nyn": "nyankolština",
-        "nyo": "Nyoro",
-        "nzi": "nzima",
-        "oci": "Occitan (post 1500)",
-        "oji": "Ojibwa",
-        "ori": "orija",
-        "orm": "Oromo (Afan)",
-        "osa": "osagština",
-        "oss": "Ossetian",
-        "ota": "turečtina; osmanská (1500-1928)",
-        "pag": "pangsinan",
-        "pal": "pahlaví",
-        "pam": "pampangau",
-        "pan": "Panjabi",
-        "pap": "papiamento",
-        "pau": "palauština",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "Slovinština",
-        "pli": "páli",
-        "pol": "Polština",
-        "pon": "pohnpeiština",
-        "por": "portugalština",
-        "pro": "provensálština; stará (do 1500)",
-        "pus": "pašto",
-        "que": "kečuánština",
-        "raj": "rádžasthánština",
-        "rap": "rapanuiština",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "římština",
-        "ron": "rumunština",
-        "run": "Kirundi",
-        "rup": "Romanian; Macedo-",
-        "rus": "Ruština",
-        "sad": "sandawština",
-        "sag": "sangoština",
-        "sah": "jakutština",
-        "sam": "Aramaic; Samaritan",
-        "san": "sanskrt",
-        "sas": "sačtina",
-        "sat": "santálí",
-        "scn": "sicilština",
-        "sco": "skotština",
-        "sel": "selkupština",
-        "sga": "irština; stará (do 900)",
-        "shn": "šanština",
-        "sid": "sidamo",
-        "sin": "Sinhálština",
-        "slk": "Slovenština",
-        "slv": "slovinština",
-        "sma": "Sami; Southern",
-        "sme": "Sami; Northern",
-        "smj": "lule sami",
-        "smn": "Sami; Inari",
-        "smo": "Samoyština",
-        "sms": "Sami; Skolt",
-        "sna": "šonština",
-        "snd": "sindhština",
-        "snk": "sonikština",
-        "sog": "sogdijština",
-        "som": "somálština",
-        "sot": "sotština; jižní",
-        "spa": "španělština",
-        "sqi": "albánština",
-        "srd": "sardinština",
-        "srn": "Sranan Tongo",
-        "srp": "srbština",
-        "srr": "Serer",
-        "ssw": "Siswatština",
-        "suk": "sukuma",
-        "sun": "Sundanština",
-        "sus": "susu",
-        "sux": "sumerština",
-        "swa": "svahilština (makrojazyk)",
-        "swe": "švédština",
-        "syc": "Syriac; Classical",
-        "syr": "syrština",
-        "tah": "tahitština",
-        "tam": "Tamilština",
-        "tat": "tatarština",
-        "tel": "Telugu",
-        "tem": "temne",
-        "ter": "tereno",
-        "tet": "tetumština",
-        "tgk": "Tádžičtina",
-        "tgl": "Tagalog",
-        "tha": "thajština",
-        "tig": "tigrejština",
-        "tir": "Tigrinijština",
-        "tiv": "tivština",
-        "tkl": "tokelauština",
-        "tlh": "Klingon",
-        "tli": "tlingit",
-        "tmh": "Tamashek",
-        "tog": "tongština (nyasa)",
-        "ton": "Tonga",
-        "tpi": "tok pisin",
-        "tsi": "tsimshijské jazyky",
-        "tsn": "Setswanština",
-        "tso": "Tsonga",
-        "tuk": "turkmenistánština",
-        "tum": "tumbukština",
-        "tur": "turečtina",
-        "tvl": "tuvalština",
-        "twi": "ťwiština",
-        "tyv": "tuvština",
-        "udm": "udmurtština",
-        "uga": "ugaritština",
-        "uig": "Uighurština",
-        "ukr": "ukrajinština",
-        "umb": "umbundu",
-        "und": "neurčitý",
-        "urd": "urdština",
-        "uzb": "uzbekistánština",
-        "vai": "vai",
-        "ven": "vendština",
-        "vie": "vietnamština",
-        "vol": "volapük",
-        "vot": "votiatština",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "washo",
-        "wln": "valonština",
-        "wol": "volofština",
-        "xal": "Kalmyk",
-        "xho": "xhoština",
-        "yao": "jaoština",
-        "yap": "japština",
-        "yid": "Jidiš",
-        "yor": "jorubština",
-        "zap": "Zapotec",
-        "zbl": "Blissymbols",
-        "zen": "zenaga",
-        "zha": "Zhuang",
-        "zho": "čínština",
-        "zul": "Zulu",
-        "zun": "zunijština",
-        "zxx": "bez lingvistického obsahu",
-        "zza": "zaza"
-    },
-    "es": {
-        "aar": "Afar",
-        "abk": "Abkhazian",
+    "tr": {
+        "abk": "Abhazca",
         "ace": "Achinese",
         "ach": "Acoli",
         "ada": "Adangme",
         "ady": "Adyghe",
+        "aar": "Afar",
         "afh": "Afrihili",
-        "afr": "Afrikaans",
-        "ain": "Ainu (Japan)",
-        "aka": "Akan",
-        "akk": "Akkadian",
-        "ale": "Aleut",
-        "alt": "Altai; Southern",
-        "amh": "Amharic",
-        "ang": "English; Old (ca. 450-1100)",
+        "afr": "Afrikanca",
+        "ain": "Ainu (Japonca)",
+        "aka": "Akanca (Afrika dili)",
+        "akk": "Akatça",
+        "sqi": "Albanian",
+        "ale": "Alaskaca",
+        "amh": "Etiyopyaca",
         "anp": "Angika",
-        "ara": "Arabic",
-        "arc": "Aramaic; Official (700-300 BCE)",
-        "arg": "Aragonese",
-        "arn": "Mapudungun",
-        "arp": "Arapaho",
-        "arw": "Arawak",
-        "asm": "Assamese",
-        "ast": "Asturian",
-        "ava": "Avaric",
-        "ave": "Avestan",
-        "awa": "Awadhi",
-        "aym": "Aymara",
-        "aze": "Azerbaijani",
-        "bak": "Bashkir",
-        "bal": "Baluchi",
-        "bam": "Bambara",
-        "ban": "Balinese",
-        "bas": "Basa (Cameroon)",
-        "bej": "Beja",
-        "bel": "Belarusian",
+        "ara": "Arapça",
+        "arg": "Aragonca (İspanya)",
+        "arp": "Arapaho (Kuzey Amerika yerlileri)",
+        "arw": "Arawak (Surinam)",
+        "hye": "Ermenice",
+        "asm": "Assamese (Hindistan)",
+        "ast": "Asturyasca",
+        "ava": "Avarca",
+        "ave": "Avestan (Eski İran)",
+        "awa": "Awadhi (Hindistan)",
+        "aym": "Aymara (Güney Amerika)",
+        "aze": "Azerice",
+        "ban": "Balice (Bali adaları)",
+        "bal": "Belucice (İran)",
+        "bam": "Bambara (Mali)",
+        "bas": "Basa (Kamerun)",
+        "bak": "Başkırca",
+        "eus": "Baskça",
+        "bej": "Beja (Eritre; Sudan)",
+        "bel": "Beyaz Rusça",
         "bem": "Bemba (Zambia)",
-        "ben": "Bengali",
-        "bho": "Bhojpuri",
-        "bik": "Bikol",
-        "bin": "Bini",
-        "bis": "Bislama",
-        "bla": "Siksika",
-        "bod": "Tibetan",
-        "bos": "Bosnian",
-        "bra": "Braj",
-        "bre": "Breton",
-        "bua": "Buriat",
-        "bug": "Buginese",
-        "bul": "Bulgarian",
+        "ben": "Bengalce",
+        "bho": "Bhojpuri (Hindistan)",
+        "bik": "Bikol (Filipinler)",
         "byn": "Bilin",
-        "cad": "Caddo",
-        "car": "Carib; Galibi",
-        "cat": "Catalan",
-        "ceb": "Cebuano",
-        "ces": "Czech",
-        "cha": "Chamorro",
-        "chb": "Chibcha",
-        "che": "Chechen",
-        "chg": "Chagatai",
+        "bin": "Bini (Afrika)",
+        "bis": "Bislama (Vanuatu; Kuzey Pasifik)",
+        "zbl": "Blis Sembolleri",
+        "bos": "Boşnakça",
+        "bra": "Braj (Hindistan)",
+        "bre": "Bretonca",
+        "bug": "Buginese (Endonezya)",
+        "bul": "Bulgarca",
+        "bua": "Buriat (Moğolistan)",
+        "mya": "Burmaca",
+        "cad": "Caddo (Kuzey Amerika yerlileri)",
+        "cat": "Katalanca",
+        "ceb": "Cebuano (Filipinler)",
+        "chg": "Çağatayca",
+        "cha": "Chamorro (Guam adaları)",
+        "che": "Çeçence",
+        "chr": "Cherokee (Kuzey Amerika yerlileri)",
+        "chy": "Cheyenne (kuzey Amerika yerlileri)",
+        "chb": "Chibcha (Kolombiya)",
+        "zho": "Çince",
+        "chn": "Chinook lehçesi (Kuzey Batı Amerika kıyıları)",
+        "chp": "Chipewyan (Kuzey Amerika yerlileri)",
+        "cho": "Choctaw (Kuzey Amerika yerlileri)",
         "chk": "Chuukese",
-        "chm": "Mari (Russia)",
-        "chn": "Chinook jargon",
-        "cho": "Choctaw",
-        "chp": "Chipewyan",
-        "chr": "Cherokee",
-        "chu": "Slavonic; Old",
-        "chv": "Chuvash",
-        "chy": "Cheyenne",
-        "cop": "Coptic",
-        "cor": "Cornish",
-        "cos": "Corsican",
-        "cre": "Cree",
-        "crh": "Turkish; Crimean",
-        "csb": "Kashubian",
-        "cym": "Welsh",
-        "dak": "Dakota",
-        "dan": "Danish",
-        "dar": "Dargwa",
-        "del": "Delaware",
-        "den": "Slave (Athapascan)",
-        "deu": "German",
-        "dgr": "Dogrib",
-        "din": "Dinka",
+        "chv": "Çuvaş (Türkçe)",
+        "cop": "Kıptice (Eski Mısır)",
+        "cor": "Cornish (Kelt)",
+        "cos": "Korsikaca",
+        "cre": "Cree (Kuzey Amerika yerlileri)",
+        "mus": "Creek",
+        "hrv": "Hırvatça",
+        "ces": "Çekçe",
+        "dak": "Dakota (Kuzey Amerika yerlileri)",
+        "dan": "Danimarkaca; Danca",
+        "dar": "Dargwa (Dağıstan)",
+        "del": "Delaware (Kuzey Amerika yerlileri)",
         "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "Sorbian; Lower",
-        "dua": "Duala",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "Dyula",
-        "dzo": "Dzongkha",
-        "efi": "Efik",
-        "egy": "Egyptian (Ancient)",
-        "eka": "Ekajuk",
-        "ell": "Greek; Modern (1453-)",
-        "elx": "Elamite",
-        "eng": "English",
-        "enm": "English; Middle (1100-1500)",
+        "din": "Dinka (Sudan)",
+        "doi": "Dogri (makro dili)",
+        "dgr": "Dogrib (Kanada)",
+        "dua": "Duala (Afrika)",
+        "nld": "Flâmanca (Hollanda dili)",
+        "dyu": "Dyula (Burkina Faso; Mali)",
+        "dzo": "Dzongkha (Butan)",
+        "efi": "Efik (Afrika)",
+        "egy": "Mısırca (Eski)",
+        "eka": "Ekajuk (Afrika)",
+        "elx": "Elamca",
+        "eng": "İngilizce",
+        "myv": "Erzya dili",
         "epo": "Esperanto",
-        "est": "Estonian",
-        "eus": "Basque",
-        "ewe": "Ewe",
-        "ewo": "Ewondo",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "Faroese",
-        "fas": "Persian",
-        "fat": "Fanti",
-        "fij": "Fijian",
-        "fil": "Filipino",
-        "fin": "Finnish",
-        "fon": "Fon",
-        "fra": "French",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "Fulah",
-        "fur": "Friulian",
-        "gaa": "Ga",
-        "gay": "Gayo",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "Geez",
-        "gil": "Gilbertese",
-        "gla": "Gaelic; Scottish",
-        "gle": "Irish",
-        "glg": "Galician",
-        "glv": "Manx",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "Gondi",
-        "gor": "Gorontalo",
-        "got": "Gothic",
-        "grb": "Grebo",
-        "grc": "Greek; Ancient (to 1453)",
-        "grn": "Guarani",
-        "gsw": "German; Swiss",
-        "guj": "Gujarati",
+        "est": "Estonca",
+        "ewe": "Ewe (Afrika)",
+        "ewo": "Ewondo (Afrika)",
+        "fan": "Fang (Ekvatoryal Guinea)",
+        "fat": "Fanti (Afrika)",
+        "fao": "Faroece",
+        "fij": "Fiji dili",
+        "fil": "Filipince",
+        "fin": "Fince",
+        "fon": "Fon (Benin)",
+        "fra": "Fransızca",
+        "fur": "Friulian (İtalya)",
+        "ful": "Fulah (Afrika)",
+        "gaa": "Ganaca",
+        "glg": "Galce",
+        "lug": "Ganda Dili",
+        "gay": "Gayo (Sumatra)",
+        "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
+        "gez": "Geez (Etiyopya)",
+        "kat": "Gürcüce",
+        "deu": "Almanca",
+        "gil": "Kiribati dili",
+        "gon": "Gondi (Hindistan)",
+        "gor": "Gorontalo (Endonezya)",
+        "got": "Gotik",
+        "grb": "Grebo (Liberya)",
+        "grn": "Guarani (Paraguay)",
+        "guj": "Gucaratça",
         "gwi": "Gwichʼin",
-        "hai": "Haida",
-        "hat": "Creole; Haitian",
-        "hau": "Hausa",
-        "haw": "Hawaiian",
-        "heb": "Hebrew",
-        "her": "Herero",
+        "hai": "Haida (Kuzey Amerika yerlileri)",
+        "hau": "Hausa Dili",
+        "haw": "Havai Dili",
+        "heb": "İbranice",
+        "her": "Herero Dili",
         "hil": "Hiligaynon",
-        "hin": "Hindi",
-        "hit": "Hittite",
-        "hmn": "Hmong",
+        "hin": "Hintçe",
         "hmo": "Hiri Motu",
-        "hrv": "Croatian",
-        "hsb": "Sorbian; Upper",
-        "hun": "Hungarian",
+        "hit": "Hititçe",
+        "hmn": "Hmong",
+        "hun": "Macarca",
         "hup": "Hupa",
-        "hye": "Armenian",
         "iba": "Iban",
-        "ibo": "Igbo",
-        "ido": "Ido",
-        "iii": "Yi; Sichuan",
-        "iku": "Inuktitut",
-        "ile": "Interlingue",
+        "isl": "İzlandaca",
+        "ido": "Ido Dili",
+        "ibo": "Igbo Dili",
         "ilo": "Iloko",
-        "ina": "Interlingua (International Auxiliary Language Association)",
-        "ind": "Indonesian",
-        "inh": "Ingush",
-        "ipk": "Inupiaq",
-        "isl": "Icelandic",
-        "ita": "Italian",
-        "jav": "Javanese",
-        "jbo": "Lojban",
-        "jpn": "Japanese",
-        "jpr": "Judeo-Persian",
-        "jrb": "Judeo-Arabic",
-        "kaa": "Kara-Kalpak",
+        "ind": "Endonezyaca",
+        "inh": "İnguşca",
+        "ina": "Interlingua (Uluslararası Yardımcı Dil Kurumu)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiak Dili",
+        "gle": "İrlandaca",
+        "ita": "İtalyanca",
+        "jpn": "Japonca",
+        "jav": "Cava Dili",
+        "jrb": "Yahudi-Arapçası",
+        "jpr": "Yahudi-Farsça",
+        "kbd": "Kabardian",
         "kab": "Kabyle",
         "kac": "Kachin",
         "kal": "Kalaallisut",
+        "xal": "Kalmyk",
         "kam": "Kamba (Kenya)",
         "kan": "Kannada",
-        "kas": "Kashmiri",
-        "kat": "Georgian",
-        "kau": "Kanuri",
-        "kaw": "Kawi",
-        "kaz": "Kazakh",
-        "kbd": "Kabardian",
-        "kha": "Khasi",
-        "khm": "Khmer; Central",
-        "kho": "Khotanese",
-        "kik": "Kikuyu",
-        "kin": "Kinyarwanda",
-        "kir": "Kirghiz",
-        "kmb": "Kimbundu",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "Komi",
-        "kon": "Kongo",
-        "kor": "Korean",
-        "kos": "Kosraean",
-        "kpe": "Kpelle",
+        "kau": "Kanuri Dili",
+        "kaa": "Kara-Kalpak",
         "krc": "Karachay-Balkar",
         "krl": "Karelian",
-        "kru": "Kurukh",
-        "kua": "Kuanyama",
+        "kas": "Keşmirce",
+        "csb": "Kashubian (Lehçe diyalekti)",
+        "kaw": "Kawi",
+        "kaz": "Kazakça",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu Dili",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kırgızca",
+        "tlh": "Klingon",
+        "kom": "Komi Dili",
+        "kon": "Kongo Dili",
+        "kok": "Konkani (makro dil)",
+        "kor": "Korece",
+        "kos": "Kosraean",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama Dili",
         "kum": "Kumyk",
-        "kur": "Kurdish",
+        "kur": "Kürtçe",
+        "kru": "Kurukh",
         "kut": "Kutenai",
         "lad": "Ladino",
         "lah": "Lahnda",
         "lam": "Lamba",
-        "lao": "Lao",
-        "lat": "Latin",
-        "lav": "Latvian",
+        "lao": "Laos Dili",
+        "lat": "Latince",
+        "lav": "Letonca",
         "lez": "Lezghian",
-        "lim": "Limburgan",
-        "lin": "Lingala",
-        "lit": "Lithuanian",
-        "lol": "Mongo",
+        "lim": "Liburg Dili",
+        "lin": "Lingala Dili",
+        "lit": "Litvanyaca",
+        "jbo": "Lojban dili",
         "loz": "Lozi",
-        "ltz": "Luxembourgish",
+        "lub": "Luba Katanga Dili",
         "lua": "Luba-Lulua",
-        "lub": "Luba-Katanga",
-        "lug": "Ganda",
         "lui": "Luiseno",
+        "smj": "Lule Sami",
         "lun": "Lunda",
-        "luo": "Luo (Kenya and Tanzania)",
+        "luo": "Luo (Kenya ve Tanzanya)",
         "lus": "Lushai",
+        "ltz": "Lüksemburg Dili",
+        "mkd": "Makedonca",
         "mad": "Madurese",
         "mag": "Magahi",
-        "mah": "Marshallese",
-        "mai": "Maithili",
+        "mai": "Maithili dili",
         "mak": "Makasar",
+        "mlg": "Madagaskar Dili",
+        "msa": "Malay (makro dili)",
         "mal": "Malayalam",
-        "man": "Mandingo",
-        "mar": "Marathi",
-        "mas": "Masai",
-        "mdf": "Moksha",
-        "mdr": "Mandar",
-        "men": "Mende (Sierra Leone)",
-        "mga": "Irish; Middle (900-1200)",
-        "mic": "Mi'kmaq",
-        "min": "Minangkabau",
-        "mis": "Uncoded languages",
-        "mkd": "Macedonian",
-        "mlg": "Malagasy",
-        "mlt": "Maltese",
+        "mlt": "Maltaca",
         "mnc": "Manchu",
-        "mni": "Manipuri",
-        "moh": "Mohawk",
-        "mon": "Mongolian",
-        "mos": "Mossi",
-        "mri": "Maori",
-        "msa": "Malay (macrolanguage)",
-        "mul": "Multiple languages",
-        "mus": "Creek",
-        "mwl": "Mirandese",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri dili",
+        "glv": "Manx (Galler)",
+        "mri": "Maori Dili",
+        "arn": "Mapudungun",
+        "mar": "Marathi",
+        "chm": "Mari (Rusya)",
+        "mah": "Marshall Dili",
         "mwr": "Marwari",
-        "mya": "Burmese",
-        "myv": "Erzya",
-        "nap": "Neapolitan",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmak",
+        "min": "Minangkabau",
+        "mwl": "Mirandese",
+        "moh": "Mohawk",
+        "mdf": "Moşka",
+        "lol": "Mongo",
+        "mon": "Moğol Dili",
+        "mos": "Mossi",
+        "mul": "Çoklu diller",
+        "nqo": "N'Ko",
         "nau": "Nauru",
-        "nav": "Navajo",
-        "nbl": "Ndebele; South",
-        "nde": "Ndebele; North",
-        "ndo": "Ndonga",
-        "nds": "German; Low",
-        "nep": "Nepali",
-        "new": "Bhasa; Nepal",
+        "nav": "Navajo Dili",
+        "ndo": "Ndonga Dili",
+        "nap": "Neapolitan",
         "nia": "Nias",
         "niu": "Niuean",
-        "nld": "Dutch",
-        "nno": "Norwegian Nynorsk",
-        "nob": "Norwegian Bokmål",
+        "zxx": "Hiçbir dil içeriği yok",
         "nog": "Nogai",
-        "non": "Norse; Old",
-        "nor": "Norwegian",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
+        "nor": "Norveçce",
+        "nob": "Norveççe Bokmal",
+        "nno": "Norveççe Nynorsk",
         "nym": "Nyamwezi",
+        "nya": "Nyanja",
         "nyn": "Nyankole",
         "nyo": "Nyoro",
         "nzi": "Nzima",
-        "oci": "Occitan (post 1500)",
-        "oji": "Ojibwa",
-        "ori": "Oriya",
-        "orm": "Oromo",
+        "oci": "Oksitanca (1500 sonrası)",
+        "oji": "Ojibwa Dili",
+        "orm": "Oromo Dili",
         "osa": "Osage",
-        "oss": "Ossetian",
-        "ota": "Turkish; Ottoman (1500-1928)",
-        "pag": "Pangasinan",
-        "pal": "Pahlavi",
-        "pam": "Pampanga",
-        "pan": "Panjabi",
-        "pap": "Papiamento",
+        "oss": "Osetya Dili",
+        "pal": "Pehlevi",
         "pau": "Palauan",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "Phoenician",
-        "pli": "Pali",
-        "pol": "Polish",
+        "pli": "Pali Dili",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Pencabi Dili",
+        "pap": "Papiamento",
+        "fas": "Farsça",
+        "phn": "Fenikçe",
         "pon": "Pohnpeian",
-        "por": "Portuguese",
-        "pro": "Provençal; Old (to 1500)",
-        "pus": "Pashto",
+        "pol": "Polonyaca",
+        "por": "Portekizce",
+        "pus": "Pushto",
         "que": "Quechua",
         "raj": "Rajasthani",
         "rap": "Rapanui",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "Romany",
-        "ron": "Romanian",
-        "run": "Rundi",
-        "rup": "Romanian; Macedo-",
-        "rus": "Russian",
+        "ron": "Rumence",
+        "roh": "Romanca",
+        "rom": "Çingene Dili",
+        "run": "Kirundi",
+        "rus": "Rusça",
+        "smo": "Samoa Dili",
         "sad": "Sandawe",
-        "sag": "Sango",
-        "sah": "Yakut",
-        "sam": "Aramaic; Samaritan",
-        "san": "Sanskrit",
+        "sag": "Sangho",
+        "san": "Sanskritçe",
+        "sat": "Santali dili",
+        "srd": "Sardinya",
         "sas": "Sasak",
-        "sat": "Santali",
-        "scn": "Sicilian",
-        "sco": "Scots",
+        "sco": "İskoç lehçesi",
         "sel": "Selkup",
-        "sga": "Irish; Old (to 900)",
-        "shn": "Shan",
-        "sid": "Sidamo",
-        "sin": "Sinhala",
-        "slk": "Slovak",
-        "slv": "Slovenian",
-        "sma": "Sami; Southern",
-        "sme": "Sami; Northern",
-        "smj": "Lule Sami",
-        "smn": "Sami; Inari",
-        "smo": "Samoan",
-        "sms": "Sami; Skolt",
-        "sna": "Shona",
-        "snd": "Sindhi",
-        "snk": "Soninke",
-        "sog": "Sogdian",
-        "som": "Somali",
-        "sot": "Sotho; Southern",
-        "spa": "Spanish",
-        "sqi": "Albanian",
-        "srd": "Sardinian",
-        "srn": "Sranan Tongo",
-        "srp": "Serbian",
+        "srp": "Sırpça",
         "srr": "Serer",
-        "ssw": "Swati",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Sicilyalı",
+        "sid": "Sidamo",
+        "bla": "Siksika (Kuzey Amerika yerlileri)",
+        "snd": "Sindhi",
+        "sin": "Sinhala Dili",
+        "den": "Slave (Athapascan; Kuzey Amerika yerlileri)",
+        "slk": "Slovakça",
+        "slv": "Slovence",
+        "sog": "Sogdian",
+        "som": "Somali Dili",
+        "snk": "Soninke",
+        "spa": "İspanyolca",
+        "srn": "Sranan Tongo",
         "suk": "Sukuma",
-        "sun": "Sundanese",
+        "sux": "Sümerce",
+        "sun": "Sudan Dili",
         "sus": "Susu",
-        "sux": "Sumerian",
-        "swa": "Swahili (macrolanguage)",
-        "swe": "Swedish",
-        "syc": "Syriac; Classical",
-        "syr": "Syriac",
-        "tah": "Tahitian",
-        "tam": "Tamil",
-        "tat": "Tatar",
+        "swa": "Swahili (makro dil)",
+        "ssw": "Siswati",
+        "swe": "İsveçce",
+        "syr": "Süryanice",
+        "tgl": "Tagalog",
+        "tah": "Tahitice",
+        "tgk": "Tacikçe",
+        "tmh": "Tamashek",
+        "tam": "Tamilce",
+        "tat": "Tatarca",
         "tel": "Telugu",
-        "tem": "Timne",
         "ter": "Tereno",
         "tet": "Tetum",
-        "tgk": "Tajik",
-        "tgl": "Tagalog",
-        "tha": "Thai",
+        "tha": "Taylandça",
+        "bod": "Tibetçe",
         "tig": "Tigre",
-        "tir": "Tigrinya",
+        "tir": "Tigrinya Dili",
+        "tem": "Timne",
         "tiv": "Tiv",
-        "tkl": "Tokelau",
-        "tlh": "Klingon",
         "tli": "Tlingit",
-        "tmh": "Tamashek",
-        "tog": "Tonga (Nyasa)",
-        "ton": "Tonga (Tonga Islands)",
         "tpi": "Tok Pisin",
+        "tkl": "Tokelau",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga",
         "tsi": "Tsimshian",
-        "tsn": "Tswana",
         "tso": "Tsonga",
-        "tuk": "Turkmen",
+        "tsn": "Setswana",
         "tum": "Tumbuka",
-        "tur": "Turkish",
+        "tur": "Türkçe",
+        "tuk": "Türkmence",
         "tvl": "Tuvalu",
-        "twi": "Twi",
         "tyv": "Tuvinian",
+        "twi": "Twi",
         "udm": "Udmurt",
-        "uga": "Ugaritic",
-        "uig": "Uighur",
-        "ukr": "Ukrainian",
+        "uga": "Ugarit Çivi Yazısı",
+        "uig": "Uygurca",
+        "ukr": "Ukraynaca",
         "umb": "Umbundu",
-        "und": "Undetermined",
-        "urd": "Urdu",
-        "uzb": "Uzbek",
+        "mis": "Şifresiz diller",
+        "und": "Belirlenemeyen",
+        "urd": "Urduca",
+        "uzb": "Özbekçe",
         "vai": "Vai",
-        "ven": "Venda",
-        "vie": "Vietnamese",
+        "ven": "Venda Dili",
+        "vie": "Vietnamca",
         "vol": "Volapük",
         "vot": "Votic",
+        "wln": "Valonca",
+        "war": "Waray (Filipinler)",
+        "was": "Vasho",
+        "cym": "Gal Dili",
         "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "Washo",
-        "wln": "Walloon",
         "wol": "Wolof",
-        "xal": "Kalmyk",
         "xho": "Xhosa",
+        "sah": "Yakut",
         "yao": "Yao",
         "yap": "Yapese",
-        "yid": "Yiddish",
+        "yid": "Yidiş",
         "yor": "Yoruba",
         "zap": "Zapotec",
-        "zbl": "Blissymbols",
+        "zza": "Zaza",
         "zen": "Zenaga",
-        "zha": "Zhuang",
-        "zho": "Chinese",
+        "zha": "Zuang Dili",
         "zul": "Zulu",
-        "zun": "Zuni",
+        "zun": "Zuni"
+    },
+    "uk": {
+        "aar": "афар",
+        "abk": "абхазька",
+        "ace": "ачеська",
+        "ach": "ачолі",
+        "ada": "адангме",
+        "ady": "адигейська",
+        "afh": "афрингілі",
+        "afr": "африкаанс",
+        "ain": "айнська (Японія)",
+        "aka": "акан",
+        "akk": "аккадська",
+        "ale": "алеутська",
+        "alt": "алтайська (південна)",
+        "amh": "амхарська",
+        "ang": "давньоанглійська (бл. 450-1100)",
+        "anp": "ангіка",
+        "ara": "арабська",
+        "arc": "арамейська (офіційна; 700-300 до нашої ери)",
+        "arg": "арагонська",
+        "arn": "арауканська",
+        "arp": "арапахо",
+        "arw": "аравакська",
+        "asm": "ассамська",
+        "ast": "астурійська",
+        "ava": "аварська",
+        "ave": "авестанська",
+        "awa": "авадхі",
+        "aym": "аймарська",
+        "aze": "азербайджанська",
+        "bak": "башкирська",
+        "bal": "белуджійська",
+        "bam": "бамбара",
+        "ban": "балійська",
+        "bas": "баса (Камерун)",
+        "bej": "бежа",
+        "bel": "білоруська",
+        "bem": "бемба (Замбія)",
+        "ben": "бенгальська",
+        "bho": "бходжпурі",
+        "bik": "бікольська",
+        "bin": "біні",
+        "bis": "біслама",
+        "bla": "сісіка",
+        "bod": "тибетська",
+        "bos": "боснійська",
+        "bra": "брай",
+        "bre": "бретонська",
+        "bua": "бурятська",
+        "bug": "бугійська",
+        "bul": "болгарська",
+        "byn": "білін",
+        "cad": "каддо",
+        "car": "карибська (галібі)",
+        "cat": "каталонська",
+        "ceb": "себуано",
+        "ces": "чеська",
+        "cha": "чаморо",
+        "chb": "чибча",
+        "che": "чеченська",
+        "chg": "чагатайська",
+        "chk": "чуукська",
+        "chm": "марійська (Росія)",
+        "chn": "чинук; жаргон",
+        "cho": "чоктау",
+        "chp": "чипев’ян",
+        "chr": "черокі",
+        "chu": "давньослов’янська",
+        "chv": "чуваська",
+        "chy": "шаєнн",
+        "cop": "коптська",
+        "cor": "корнійська",
+        "cos": "корсиканська",
+        "cre": "крі",
+        "crh": "турецька (кримська)",
+        "csb": "кашубська",
+        "cym": "валійська",
+        "dak": "дакота",
+        "dan": "данська",
+        "dar": "даргва",
+        "del": "делаварська",
+        "den": "слейві (атабаська)",
+        "deu": "німецька",
+        "dgr": "догріб",
+        "din": "дінка",
+        "div": "мальдивська",
+        "doi": "догрі (макромова)",
+        "dsb": "нижньолужицька",
+        "dua": "дуала",
+        "dum": "середньовічна голландська (бл. 1050-1350)",
+        "dyu": "діула",
+        "dzo": "дзонг-ке",
+        "efi": "ефік",
+        "egy": "давньоєгипетська",
+        "eka": "екаджук",
+        "ell": "грецька (з 1453)",
+        "elx": "еламська",
+        "eng": "англійська",
+        "enm": "середньоанглійська (1100-1500)",
+        "epo": "есперанто",
+        "est": "естонська",
+        "eus": "баскська",
+        "ewe": "еве",
+        "ewo": "евондо",
+        "fan": "фанг (Екваторіальна Гвінея)",
+        "fao": "фарерська",
+        "fas": "перська",
+        "fat": "фанті",
+        "fij": "фіджійська",
+        "fil": "філіппінська",
+        "fin": "фінська",
+        "fon": "фон",
+        "fra": "французька",
+        "frm": "середньофранцузька (бл. 1400-1600)",
+        "fro": "давньофранцузька (842-бл. 1400)",
+        "frr": "фризька (північна)",
+        "frs": "фризька (східна)",
+        "fry": "фризька (західна)",
+        "ful": "фулах",
+        "fur": "фріульська",
+        "gaa": "га",
+        "gay": "гайо",
+        "gba": "гбая (Центральноафриканська Республіка)",
+        "gez": "гііз",
+        "gil": "гільбертська",
+        "gla": "гаельська (Шотландія)",
+        "gle": "ірландська",
+        "glg": "галісійська",
+        "glv": "манкс",
+        "gmh": "середньоверхньонімецька (бл. 1050-1500)",
+        "goh": "давньосередньонімецька (бл. 750-1050)",
+        "gon": "гонді",
+        "gor": "горонтало",
+        "got": "готська",
+        "grb": "гребо",
+        "grc": "давньогрецька (до 1453)",
+        "grn": "гуарані",
+        "gsw": "німецька (Швейцарія)",
+        "guj": "гуджараті",
+        "gwi": "гвічин",
+        "hai": "хайда",
+        "hat": "креольська (гаїтянська)",
+        "hau": "хауса",
+        "haw": "гавайська",
+        "heb": "іврит",
+        "her": "гереро",
+        "hil": "хілігайнон",
+        "hin": "хінді",
+        "hit": "хетська",
+        "hmn": "хмонг",
+        "hmo": "хірімоту",
+        "hrv": "хорватська",
+        "hsb": "верхньолужицька",
+        "hun": "угорська",
+        "hup": "хупа",
+        "hye": "вірменська",
+        "iba": "ібанська",
+        "ibo": "ігбо",
+        "ido": "ідо",
+        "iii": "ї (Сичуань)",
+        "iku": "інуктітут",
+        "ile": "окциденталь",
+        "ilo": "ілоко",
+        "ina": "інтерлінгва (Асоціація міжнародної допоміжної мови)",
+        "ind": "індонезійська",
+        "inh": "інгушська",
+        "ipk": "інупіак",
+        "isl": "ісландська",
+        "ita": "італійська",
+        "jav": "яванська",
+        "jbo": "ложбан",
+        "jpn": "японська",
+        "jpr": "єврейсько-перська",
+        "jrb": "єврейсько-арабська",
+        "kaa": "каракалпацька",
+        "kab": "кабильська",
+        "kac": "качин",
+        "kal": "калаалісут",
+        "kam": "камба (Кенія)",
+        "kan": "каннада",
+        "kas": "кашмірська",
+        "kat": "грузинська",
+        "kau": "канурі",
+        "kaw": "каві",
+        "kaz": "казахська",
+        "kbd": "кабардінська",
+        "kha": "кхасі",
+        "khm": "кхмерська (центральна)",
+        "kho": "хотаносакська",
+        "kik": "кікуйю",
+        "kin": "кіньяруанда",
+        "kir": "киргизька",
+        "kmb": "кімбунду",
+        "kok": "конкані (макромова)",
+        "kom": "комі",
+        "kon": "конго",
+        "kor": "корейська",
+        "kos": "косрейська",
+        "kpe": "кпелле",
+        "krc": "карачаєво-балкарська",
+        "krl": "карельська",
+        "kru": "курух",
+        "kua": "куаньяма",
+        "kum": "кумикська",
+        "kur": "курдська",
+        "kut": "кутенай",
+        "lad": "ладіно",
+        "lah": "лахнда",
+        "lam": "ламба",
+        "lao": "лаоська",
+        "lat": "латинська",
+        "lav": "латиська",
+        "lez": "лезгінська",
+        "lim": "лімбурганська",
+        "lin": "лінгала",
+        "lit": "литовська",
+        "lol": "монго",
+        "loz": "лозі",
+        "ltz": "люксембурзька",
+        "lua": "луба-лулуа",
+        "lub": "луба-катанга",
+        "lug": "ганда",
+        "lui": "луйсеньо",
+        "lun": "лунда",
+        "luo": "луо (Кенія і Танзанія)",
+        "lus": "лушай",
+        "mad": "мадурська",
+        "mag": "магахі",
+        "mah": "маршальська",
+        "mai": "майтхілі",
+        "mak": "макасарська",
+        "mal": "малаялам",
+        "man": "мандінго",
+        "mar": "мараті",
+        "mas": "масаї",
+        "mdf": "мокшанська",
+        "mdr": "мандарська",
+        "men": "менде (Сьєрра-Леоне)",
+        "mga": "середньоірландська (900-1200)",
+        "mic": "мікмак",
+        "min": "мінангкабау",
+        "mis": "мови без коду",
+        "mkd": "македонська",
+        "mlg": "малагасійська",
+        "mlt": "мальтійська",
+        "mnc": "манчжурська",
+        "mni": "маніпурська",
+        "moh": "мохаук",
+        "mon": "монгольська",
+        "mos": "мосі",
+        "mri": "маорійська",
+        "msa": "малайська (макромова)",
+        "mul": "мови; що належать до декількох родин",
+        "mus": "крікська",
+        "mwl": "мірандська",
+        "mwr": "марварі",
+        "mya": "бірманська",
+        "myv": "ерзянська",
+        "nap": "неаполітанська",
+        "nau": "науру",
+        "nav": "навахо",
+        "nbl": "південна ндебеле",
+        "nde": "північна ндебеле",
+        "ndo": "ндонга",
+        "nds": "нижньонімецька",
+        "nep": "непальська",
+        "new": "бхаса (Непал)",
+        "nia": "ніасійська",
+        "niu": "ніуе",
+        "nld": "голландська",
+        "nno": "норвезька нюноршк",
+        "nob": "норвезька букмол",
+        "nog": "ногайська",
+        "non": "давньонорвезька",
+        "nor": "норвезька",
+        "nqo": "н’ко",
+        "nso": "сото; північне",
+        "nwc": "неварі (давня)",
+        "nya": "ньянджа",
+        "nym": "ньямвезі",
+        "nyn": "ньянколе",
+        "nyo": "ньоро",
+        "nzi": "нзіма",
+        "oci": "оксітанська (після 1500)",
+        "oji": "оджибва",
+        "ori": "орія",
+        "orm": "оромо",
+        "osa": "оседжі",
+        "oss": "осетинська",
+        "ota": "оттоманська турецька (1500-1928)",
+        "pag": "пангасінан",
+        "pal": "пехлевійська",
+        "pam": "пампанга",
+        "pan": "пенджабі",
+        "pap": "папьяменто",
+        "pau": "палау",
+        "peo": "давньоперська (бл. 600-400 до н.е.)",
+        "phn": "фінікійська",
+        "pli": "палі",
+        "pol": "польська",
+        "pon": "понапе",
+        "por": "португальська",
+        "pro": "провансальська (давня; до 1500 року)",
+        "pus": "пуштунська",
+        "que": "кечуа",
+        "raj": "раджастхані",
+        "rap": "рапануї",
+        "rar": "маорійська (острови Кука)",
+        "roh": "ретророманська",
+        "rom": "ромська",
+        "ron": "румунська",
+        "run": "рунді",
+        "rup": "македоно-румунська",
+        "rus": "російська",
+        "sad": "сандаве",
+        "sag": "санго",
+        "sah": "якутська",
+        "sam": "арамейська (самаритянська)",
+        "san": "санскрит",
+        "sas": "сасакська",
+        "sat": "санталі",
+        "scn": "сицилійська",
+        "sco": "шотландська",
+        "sel": "селькупська",
+        "sga": "давньоірландська (до 900)",
+        "shn": "шан",
+        "sid": "сидама",
+        "sin": "сингалійська",
+        "slk": "словацька",
+        "slv": "словенська",
+        "sma": "саамська (південна)",
+        "sme": "саамська (північна)",
+        "smj": "лулесаамська",
+        "smn": "саамська (інарі)",
+        "smo": "самоанська",
+        "sms": "саамська (сколт)",
+        "sna": "шона",
+        "snd": "синдхі",
+        "snk": "сонікійська",
+        "sog": "согдійська",
+        "som": "сомалійська",
+        "sot": "сото; південна",
+        "spa": "іспанська",
+        "sqi": "албанська",
+        "srd": "сардинська",
+        "srn": "сранан-тонго",
+        "srp": "сербська",
+        "srr": "серер",
+        "ssw": "свазі",
+        "suk": "сукума",
+        "sun": "сунданська",
+        "sus": "сусу",
+        "sux": "шумерська",
+        "swa": "суахілі (макромова)",
+        "swe": "шведська",
+        "syc": "сирійська (класична)",
+        "syr": "сирійська",
+        "tah": "таїтянська",
+        "tam": "тамільська",
+        "tat": "татарська",
+        "tel": "телугу",
+        "tem": "тімне",
+        "ter": "терено",
+        "tet": "тетум",
+        "tgk": "таджицька",
+        "tgl": "тагалог",
+        "tha": "таїландська",
+        "tig": "тігре",
+        "tir": "тигринійська",
+        "tiv": "тиві",
+        "tkl": "токелау",
+        "tlh": "клінгонська",
+        "tli": "тлінгіт",
+        "tmh": "тамашек",
+        "tog": "тонга (ньяса)",
+        "ton": "тонга (острови Тонга)",
+        "tpi": "ток-пісін",
+        "tsi": "цимшіан",
+        "tsn": "тсвана",
+        "tso": "цонга",
+        "tuk": "туркменська",
+        "tum": "тумбука",
+        "tur": "турецька",
+        "tvl": "тувалу",
+        "twi": "тві",
+        "tyv": "тувінська",
+        "udm": "удмурдська",
+        "uga": "угаритська",
+        "uig": "уйгурська",
+        "ukr": "українська",
+        "umb": "умбунду",
+        "und": "невизначена",
+        "urd": "урду",
+        "uzb": "узбецька",
+        "vai": "вай",
+        "ven": "венда",
+        "vie": "в'єтнамська",
+        "vol": "волапюк",
+        "vot": "водська",
+        "wal": "волайтта",
+        "war": "варай (Філіппіни)",
+        "was": "вашо",
+        "wln": "валлонська",
+        "wol": "волоф",
+        "xal": "калмицька",
+        "xho": "хоза",
+        "yao": "яо",
+        "yap": "япська",
+        "yid": "ідиш",
+        "yor": "йоруба",
+        "zap": "сапотецька",
+        "zbl": "бліссимволіка",
+        "zen": "зеназька",
+        "zha": "чжуань",
+        "zho": "китайська",
+        "zul": "зулуська",
+        "zun": "зуні",
+        "zxx": "немає мовних даних",
+        "zza": "заза"
+    },
+    "zh_Hans_CN": {
+        "aar": "阿法尔语",
+        "abk": "阿布哈兹语",
+        "ace": "亚齐语",
+        "ach": "阿乔利语",
+        "ada": "阿当梅语",
+        "ady": "阿迪格语",
+        "afh": "阿弗里希利语",
+        "afr": "南非荷兰语",
+        "ain": "阿伊努语（日本）",
+        "aka": "阿坎语",
+        "akk": "阿卡德语",
+        "ale": "阿留申语",
+        "alt": "阿尔泰语（南）",
+        "amh": "阿姆哈拉语",
+        "ang": "英语（上古，约 450-1100）",
+        "anp": "安吉卡语",
+        "ara": "阿拉伯语",
+        "arc": "阿拉米语（官方，公元前 700-300）",
+        "arg": "阿拉贡语",
+        "arn": "阿劳坎语",
+        "arp": "阿拉帕霍语",
+        "arw": "阿拉瓦克语",
+        "asm": "阿萨姆语",
+        "ast": "阿斯图里亚斯语",
+        "ava": "阿瓦尔语",
+        "ave": "阿维斯陀语",
+        "awa": "阿瓦德语",
+        "aym": "艾马拉语",
+        "aze": "阿塞拜疆语",
+        "bak": "巴什基尔语",
+        "bal": "俾路支语",
+        "bam": "班巴拉语",
+        "ban": "巴厘语",
+        "bas": "巴萨语（喀麦隆）",
+        "bej": "贝扎语",
+        "bel": "白俄罗斯语",
+        "bem": "本巴语（赞比亚）",
+        "ben": "孟加拉语",
+        "bho": "博杰普尔语",
+        "bik": "比科尔语",
+        "bin": "比尼语",
+        "bis": "比斯拉马语",
+        "bla": "西克西卡语",
+        "bod": "藏语",
+        "bos": "波斯尼亚语",
+        "bra": "布拉吉语",
+        "bre": "布列塔尼语",
+        "bua": "布里亚特语",
+        "bug": "布吉语",
+        "bul": "保加利亚语",
+        "byn": "比林语",
+        "cad": "卡多语",
+        "car": "加勒比语",
+        "cat": "加泰罗尼亚语",
+        "ceb": "宿务语",
+        "ces": "捷克语",
+        "cha": "查莫罗语",
+        "chb": "奇布查语",
+        "che": "车臣语",
+        "chg": "察合台语",
+        "chk": "丘克语",
+        "chm": "马里语（俄罗斯）",
+        "chn": "奇努克混合语",
+        "cho": "乔克托语",
+        "chp": "奇佩维安语",
+        "chr": "切罗基语",
+        "chu": "斯拉夫语（古教会）",
+        "chv": "楚瓦什语",
+        "chy": "夏延语",
+        "cop": "科普特语",
+        "cor": "康沃尔语",
+        "cos": "科西嘉语",
+        "cre": "克里语",
+        "crh": "鞑靼语（克里米亚）",
+        "csb": "卡舒比语",
+        "cym": "威尔士语",
+        "dak": "达科他语",
+        "dan": "丹麦语",
+        "dar": "达尔格瓦语",
+        "del": "特拉华语",
+        "den": "史拉维语（阿沙巴斯甘）",
+        "deu": "德语",
+        "dgr": "多格里布语",
+        "din": "丁卡语",
+        "div": "迪维希语",
+        "doi": "多格拉语",
+        "dsb": "索布语（下）",
+        "dua": "杜亚拉语",
+        "dum": "荷兰语（中古，约 1050-1350）",
+        "dyu": "迪尤拉语",
+        "dzo": "宗喀语",
+        "efi": "埃菲克语",
+        "egy": "埃及语（古）",
+        "eka": "埃克丘克语",
+        "ell": "希腊语（现代，1453-）",
+        "elx": "埃兰语",
+        "eng": "英语",
+        "enm": "英语（中古，1100-1500）",
+        "epo": "世界语",
+        "est": "爱沙尼亚语",
+        "eus": "巴斯克语",
+        "ewe": "埃维语",
+        "ewo": "埃翁多语",
+        "fan": "芳语（赤道几内亚）",
+        "fao": "法罗语",
+        "fas": "波斯语",
+        "fat": "芳蒂语",
+        "fij": "斐济语",
+        "fil": "菲律宾语",
+        "fin": "芬兰语",
+        "fon": "丰语",
+        "fra": "法语",
+        "frm": "法语（中古，约 1400-1600）",
+        "fro": "法语（上古，842-约 1400）",
+        "frr": "弗里西语（北）",
+        "frs": "弗里西亚语（东）",
+        "fry": "弗里西亚语（西）",
+        "ful": "富拉语",
+        "fur": "弗留利语",
+        "gaa": "加语",
+        "gay": "卡约语",
+        "gba": "巴亚语（中非共和国）",
+        "gez": "吉兹语",
+        "gil": "吉尔伯特语",
+        "gla": "盖尔语（苏格兰）",
+        "gle": "爱尔兰语",
+        "glg": "加利西亚语",
+        "glv": "马恩岛语",
+        "gmh": "德语（中古高地，约 1050-1500）",
+        "goh": "德语（上古高地，约 750-1050）",
+        "gon": "贡德语",
+        "gor": "哥伦打洛语",
+        "got": "哥特语",
+        "grb": "格列博语",
+        "grc": "希腊语（古典，直到 1453）",
+        "grn": "瓜拉尼语",
+        "gsw": "德语（瑞士）",
+        "guj": "古吉拉特语",
+        "gwi": "库臣语",
+        "hai": "海达语",
+        "hat": "克里奥尔语（海地）",
+        "hau": "豪萨语",
+        "haw": "夏威夷语",
+        "heb": "希伯来语",
+        "her": "赫雷罗语",
+        "hil": "希利盖农语",
+        "hin": "印地语",
+        "hit": "赫梯语",
+        "hmn": "苗语",
+        "hmo": "希里莫图语",
+        "hrv": "克罗地亚语",
+        "hsb": "索布语（上）",
+        "hun": "匈牙利语",
+        "hup": "胡帕语",
+        "hye": "亚美尼亚语",
+        "iba": "伊班语",
+        "ibo": "伊博语",
+        "ido": "伊多语",
+        "iii": "彝语（四川）",
+        "iku": "伊努伊特语",
+        "ile": "国际语（西方）",
+        "ilo": "伊洛卡诺语",
+        "ina": "国际语",
+        "ind": "印尼语",
+        "inh": "印古什语",
+        "ipk": "依努庇克语",
+        "isl": "冰岛语",
+        "ita": "意大利语",
+        "jav": "爪哇语",
+        "jbo": "逻辑语",
+        "jpn": "日语",
+        "jpr": "犹太-波斯语",
+        "jrb": "犹太-阿拉伯语",
+        "kaa": "卡拉卡尔帕克语",
+        "kab": "卡布列语",
+        "kac": "景颇语",
+        "kal": "格陵兰语",
+        "kam": "坎巴语（肯尼亚）",
+        "kan": "卡纳达语",
+        "kas": "克什米尔语",
+        "kat": "格鲁吉亚语",
+        "kau": "卡努里语",
+        "kaw": "卡威语",
+        "kaz": "哈萨克语",
+        "kbd": "卡巴尔达语",
+        "kha": "卡西语",
+        "khm": "高棉语",
+        "kho": "和田语",
+        "kik": "基库尤语",
+        "kin": "基尼阿万达语",
+        "kir": "吉尔吉斯语",
+        "kmb": "金本杜语",
+        "kok": "孔卡尼语",
+        "kom": "科米语",
+        "kon": "刚果语",
+        "kor": "朝鲜语",
+        "kos": "科斯拉伊语",
+        "kpe": "克佩勒语",
+        "krc": "卡拉恰伊-巴尔卡尔语",
+        "krl": "卡累利阿语",
+        "kru": "库卢克语",
+        "kua": "宽亚玛语",
+        "kum": "库梅克语",
+        "kur": "库尔德语",
+        "kut": "库特内语",
+        "lad": "拉迪诺语",
+        "lah": "拉亨达语",
+        "lam": "兰巴语",
+        "lao": "老挝语",
+        "lat": "拉丁语",
+        "lav": "拉脱维亚语",
+        "lez": "列兹金语",
+        "lim": "林堡语",
+        "lin": "林加拉语",
+        "lit": "立陶宛语",
+        "lol": "芒戈语",
+        "loz": "洛齐语",
+        "ltz": "卢森堡语",
+        "lua": "卢巴-卢拉语",
+        "lub": "卢巴-加丹加语",
+        "lug": "干达语",
+        "lui": "卢伊塞诺语",
+        "lun": "隆达语",
+        "luo": "卢奥语（肯尼亚和坦桑尼亚）",
+        "lus": "卢萨语",
+        "mad": "马都拉语",
+        "mag": "摩揭陀语",
+        "mah": "马绍尔语",
+        "mai": "米德勒语",
+        "mak": "望加锡语",
+        "mal": "马拉雅拉姆语",
+        "man": "曼丁哥语",
+        "mar": "马拉地语",
+        "mas": "马萨伊语",
+        "mdf": "莫克沙语",
+        "mdr": "曼达语",
+        "men": "门德语（塞拉利昂）",
+        "mga": "爱尔兰语（中古，900-1200）",
+        "mic": "米克马克语",
+        "min": "米南卡保语",
+        "mis": "未被编码的语言",
+        "mkd": "马其顿语",
+        "mlg": "马达加斯加语",
+        "mlt": "马耳他语",
+        "mnc": "满语",
+        "mni": "曼尼普尔语",
+        "moh": "莫霍克语",
+        "mon": "蒙古语",
+        "mos": "莫西语",
+        "mri": "毛利语",
+        "msa": "马来语族",
+        "mul": "多种语言",
+        "mus": "克里克语",
+        "mwl": "米兰德斯语",
+        "mwr": "马尔瓦利语",
+        "mya": "缅甸语",
+        "myv": "厄尔兹亚语",
+        "nap": "拿坡里语",
+        "nau": "瑙鲁语",
+        "nav": "纳瓦霍语",
+        "nbl": "恩德贝勒语（南）",
+        "nde": "恩德贝勒语（北）",
+        "ndo": "恩敦加语",
+        "nds": "撒克逊语（低地）",
+        "nep": "尼泊尔语",
+        "new": "尼瓦尔语",
+        "nia": "尼亚斯语",
+        "niu": "纽埃语",
+        "nld": "荷兰语",
+        "nno": "新挪威语",
+        "nob": "挪威布克莫尔语",
+        "nog": "诺盖语",
+        "non": "诺尔斯语（古）",
+        "nor": "挪威语",
+        "nqo": "西非书面语言字母",
+        "nso": "索托语（北）",
+        "nwc": "尼瓦尔语（古典）",
+        "nya": "尼扬贾语",
+        "nym": "尼扬韦齐语",
+        "nyn": "尼扬科勒语",
+        "nyo": "尼奥罗语",
+        "nzi": "恩济马语",
+        "oci": "奥克西唐语（1500 后）",
+        "oji": "奥吉布瓦语",
+        "ori": "奥利亚语",
+        "orm": "奥罗莫语",
+        "osa": "奥萨格语",
+        "oss": "奥塞梯语",
+        "ota": "土耳其语（奥斯曼，1500-1928）",
+        "pag": "邦阿西楠语",
+        "pal": "钵罗钵语",
+        "pam": "邦板牙语",
+        "pan": "旁遮普语",
+        "pap": "帕皮亚门托语",
+        "pau": "帕劳语",
+        "peo": "波斯语（古，公元前约 600-400）",
+        "phn": "腓尼基语",
+        "pli": "巴利语",
+        "pol": "波兰语",
+        "pon": "波纳佩语",
+        "por": "葡萄牙语",
+        "pro": "普罗旺斯语（古，至 1500）",
+        "pus": "普什图语",
+        "que": "克丘亚语",
+        "raj": "拉贾斯坦语",
+        "rap": "拉帕努伊语",
+        "rar": "拉罗汤加语",
+        "roh": "罗曼什语",
+        "rom": "罗姆语",
+        "ron": "罗马尼亚语",
+        "run": "基隆迪语",
+        "rup": "阿罗马尼亚语",
+        "rus": "俄语",
+        "sad": "桑达韦语",
+        "sag": "桑戈语",
+        "sah": "雅库特语",
+        "sam": "阿拉米语（萨马利亚）",
+        "san": "梵语",
+        "sas": "萨萨克语",
+        "sat": "桑塔利语",
+        "scn": "西西里语",
+        "sco": "苏格兰语",
+        "sel": "塞尔库普语",
+        "sga": "爱尔兰语（古，至 900）",
+        "shn": "掸语",
+        "sid": "锡达莫语",
+        "sin": "僧加罗语",
+        "slk": "斯洛伐克语",
+        "slv": "斯洛文尼亚语",
+        "sma": "萨米语（南）",
+        "sme": "萨米语（北）",
+        "smj": "律勒欧-萨米语",
+        "smn": "伊纳里-萨米语",
+        "smo": "萨摩亚语",
+        "sms": "斯科特-萨米语",
+        "sna": "修纳语",
+        "snd": "信德语",
+        "snk": "索宁克语",
+        "sog": "粟特语",
+        "som": "索马里语",
+        "sot": "索托语（南）",
+        "spa": "西班牙语",
+        "sqi": "阿尔巴尼亚语",
+        "srd": "撒丁语",
+        "srn": "苏里南汤加语",
+        "srp": "塞尔维亚语",
+        "srr": "塞雷尔语",
+        "ssw": "斯瓦特语",
+        "suk": "苏库马语",
+        "sun": "巽他语",
+        "sus": "苏苏语",
+        "sux": "苏美尔语",
+        "swa": "斯瓦希里语族",
+        "swe": "瑞典语",
+        "syc": "叙利亚语（古典）",
+        "syr": "古叙利亚语",
+        "tah": "塔希提语",
+        "tam": "泰米尔语",
+        "tat": "塔塔尔语",
+        "tel": "泰卢固语",
+        "tem": "滕内语",
+        "ter": "特列纳语",
+        "tet": "特塔姆语",
+        "tgk": "塔吉克语",
+        "tgl": "塔加洛语",
+        "tha": "泰语",
+        "tig": "提格雷语",
+        "tir": "提格里尼亚语",
+        "tiv": "蒂夫语",
+        "tkl": "托克劳语",
+        "tlh": "克林贡语",
+        "tli": "特林吉特语",
+        "tmh": "塔马舍克语",
+        "tog": "汤加语 (尼亚萨)",
+        "ton": "汤加语（汤加岛）",
+        "tpi": "托克皮辛语",
+        "tsi": "钦西安语",
+        "tsn": "茨瓦纳语",
+        "tso": "聪加语",
+        "tuk": "土库曼语",
+        "tum": "奇图姆布卡语",
+        "tur": "土耳其语",
+        "tvl": "图瓦卢语",
+        "twi": "契维语",
+        "tyv": "图瓦语",
+        "udm": "乌德穆尔特语",
+        "uga": "乌加里特语",
+        "uig": "维吾尔语",
+        "ukr": "乌克兰语",
+        "umb": "翁本杜语",
+        "und": "未确定的语言",
+        "urd": "乌尔都语",
+        "uzb": "乌兹别克语",
+        "vai": "瓦伊语",
+        "ven": "文达语",
+        "vie": "越南语",
+        "vol": "沃拉普克语",
+        "vot": "沃提克语",
+        "wal": "瓦拉莫语",
+        "war": "瓦赖语（菲律宾）",
+        "was": "瓦肖语",
+        "wln": "瓦龙语",
+        "wol": "沃洛夫语",
+        "xal": "卡尔梅克语",
+        "xho": "科萨语",
+        "yao": "瑶语",
+        "yap": "雅浦语",
+        "yid": "依地语",
+        "yor": "约鲁巴语",
+        "zap": "萨波特克语",
+        "zbl": "布利斯符号",
+        "zen": "哲纳加语",
+        "zha": "壮语",
+        "zho": "中文",
+        "zul": "祖鲁语",
+        "zun": "祖尼语",
         "zxx": "No linguistic content",
-        "zza": "Zaza"
+        "zza": "扎扎其语"
     },
     "en": {
         "aar": "Afar",
diff --git a/cps/jinjia.py b/cps/jinjia.py
index c91534eb..688d1fba 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -25,7 +25,7 @@
 from __future__ import division, print_function, unicode_literals
 import datetime
 import mimetypes
-import re
+from uuid import uuid4
 
 from babel.dates import format_date
 from flask import Blueprint, request, url_for
@@ -44,6 +44,8 @@ log = logger.create()
 def url_for_other_page(page):
     args = request.view_args.copy()
     args['page'] = page
+    for get, val in request.args.items():
+        args[get] = val
     return url_for(request.endpoint, **args)
 
 
@@ -76,22 +78,18 @@ def mimetype_filter(val):
 @jinjia.app_template_filter('formatdate')
 def formatdate_filter(val):
     try:
-        conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
-        formatdate = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S")
-        return format_date(formatdate, format='medium', locale=get_locale())
+        return format_date(val, format='medium', locale=get_locale())
     except AttributeError as e:
         log.error('Babel error: %s, Current user locale: %s, Current User: %s', e,
                   current_user.locale,
                   current_user.nickname
                   )
-        return formatdate
+        return val
 
 
 @jinjia.app_template_filter('formatdateinput')
 def format_date_input(val):
-    conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
-    date_obj = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S")
-    input_date = date_obj.isoformat().split('T', 1)[0]  # Hack to support dates <1900
+    input_date = val.isoformat().split('T', 1)[0]  # Hack to support dates <1900
     return '' if input_date == "0101-01-01" else input_date
 
 
@@ -112,9 +110,26 @@ def timestamptodate(date, fmt=None):
 def yesno(value, yes, no):
     return yes if value else no
 
+
 @jinjia.app_template_filter('formatfloat')
 def formatfloat(value, decimals=1):
     formatedstring = '%d' % value
     if (value % 1) != 0:
         formatedstring = ('%s.%d' % (formatedstring, (value % 1) * 10**decimals)).rstrip('0')
     return formatedstring
+
+
+@jinjia.app_template_filter('formatseriesindex')
+def formatseriesindex_filter(series_index):
+    if series_index:
+        if int(series_index) - series_index == 0:
+            return int(series_index)
+        else:
+            return series_index
+    return 0
+
+@jinjia.app_template_filter('uuidfilter')
+def uuidfilter(var):
+    return uuid4()
+
+
diff --git a/cps/kobo.py b/cps/kobo.py
index a6dfc3f6..b5d5397b 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -39,22 +39,25 @@ from flask import (
     redirect,
     abort
 )
-from flask_login import current_user, login_required
+from flask_login import current_user
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
-from sqlalchemy.sql.expression import and_, or_
+from sqlalchemy.sql.expression import and_
 from sqlalchemy.exc import StatementError
 import requests
 
 from . import config, logger, kobo_auth, db, calibre_db, helper, shelf as shelf_lib, ub
+from .helper import get_download_link
 from .services import SyncToken as SyncToken
 from .web import download_required
-from .kobo_auth import requires_kobo_auth
+from .kobo_auth import requires_kobo_auth, get_auth_token
 
 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 = 100
+
 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)
@@ -119,7 +122,11 @@ def redirect_or_proxy_request():
 
 
 def convert_to_kobo_timestamp_string(timestamp):
-    return timestamp.strftime("%Y-%m-%dT%H:%M:%SZ")
+    try:
+        return timestamp.strftime("%Y-%m-%dT%H:%M:%SZ")
+    except AttributeError as exc:
+        log.debug("Timestamp not valid: {}".format(exc))
+        return datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%SZ")
 
 
 @kobo.route("/v1/library/sync")
@@ -137,68 +144,84 @@ 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)
+        formats = [data.format for data in book.Books.data]
+        if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
+            helper.convert_book_format(book.Books.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.nickname)
+
+        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,
@@ -220,11 +243,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.
@@ -240,6 +264,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)
@@ -270,10 +296,11 @@ def get_download_url_for_book(book, book_format):
         else:
             host = request.host
 
-        return "{url_scheme}://{url_base}:{url_port}/download/{book_id}/{book_format}".format(
+        return "{url_scheme}://{url_base}:{url_port}/kobo/{auth_token}/download/{book_id}/{book_format}".format(
             url_scheme=request.scheme,
             url_base=host,
             url_port=config.config_external_port,
+            auth_token=get_auth_token(),
             book_id=book.id,
             book_format=book_format.lower()
         )
@@ -344,7 +371,9 @@ def get_seriesindex(book):
 
 def get_metadata(book):
     download_urls = []
-    for book_data in book.data:
+    kepub = [data for data in book.data if data.format == 'KEPUB']
+
+    for book_data in kepub if len(kepub) > 0 else book.data:
         if book_data.format not in KOBO_FORMATS:
             continue
         for kobo_format in KOBO_FORMATS[book_data.format]:
@@ -435,8 +464,7 @@ 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()
-
+    ub.session_commit()
     return make_response(jsonify(str(shelf.uuid)), 201)
 
 
@@ -468,7 +496,7 @@ def HandleTagUpdate(tag_id):
 
         shelf.name = name
         ub.session.merge(shelf)
-        ub.session.commit()
+        ub.session_commit()
     return make_response(' ', 200)
 
 
@@ -520,8 +548,7 @@ 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()
-
+    ub.session_commit()
     return make_response('', 201)
 
 
@@ -561,7 +588,7 @@ 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()
+    ub.session_commit()
 
     if items_unknown_to_calibre:
         log.debug("Received request to remove an unknown book to a collecition. Silently ignoring item.")
@@ -607,7 +634,7 @@ def sync_shelves(sync_token, sync_results):
                 "ChangedTag": tag
             })
     sync_token.tags_last_modified = new_tags_last_modified
-    ub.session.commit()
+    ub.session_commit()
 
 
 # Creates a Kobo "Tag" object from a ub.Shelf object
@@ -688,7 +715,7 @@ def HandleStateRequest(book_uuid):
             abort(400, description="Malformed request data is missing 'ReadingStates' key")
 
         ub.session.merge(kobo_reading_state)
-        ub.session.commit()
+        ub.session_commit()
         return jsonify({
             "RequestResult": "Success",
             "UpdateResults": [update_results_response],
@@ -726,7 +753,7 @@ 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()
+    ub.session_commit()
     return book_read.kobo_reading_state
 
 
@@ -829,8 +856,7 @@ def HandleBookDeletionRequest(book_uuid):
     archived_book.last_modified = datetime.datetime.utcnow()
 
     ub.session.merge(archived_book)
-    ub.session.commit()
-
+    ub.session_commit()
     return ("", 204)
 
 
@@ -856,6 +882,7 @@ def HandleUserRequest(dummy=None):
 @kobo.route("/v1/products/<dummy>/recommendations", methods=["GET", "POST"])
 @kobo.route("/v1/products/<dummy>/nextread", methods=["GET", "POST"])
 @kobo.route("/v1/products/<dummy>/reviews", methods=["GET", "POST"])
+@kobo.route("/v1/products/books/external/<dummy>", methods=["GET", "POST"])
 @kobo.route("/v1/products/books/series/<dummy>", methods=["GET", "POST"])
 @kobo.route("/v1/products/books/<dummy>", methods=["GET", "POST"])
 @kobo.route("/v1/products/dailydeal", methods=["GET", "POST"])
@@ -865,17 +892,6 @@ def HandleProductsRequest(dummy=None):
     return redirect_or_proxy_request()
 
 
-'''@kobo.errorhandler(404)
-def handle_404(err):
-    # This handler acts as a catch-all for endpoints that we don't have an interest in
-    # implementing (e.g: v1/analytics/gettests, v1/user/recommendations, etc)
-    if err:
-        print('404')
-        return jsonify(error=str(err)), 404
-    log.debug("Unknown Request received: %s, method: %s, data: %s", request.base_url, request.method, request.data)
-    return redirect_or_proxy_request()'''
-
-
 def make_calibre_web_auth_response():
     # As described in kobo_auth.py, CalibreWeb doesn't make use practical use of this auth/device API call for
     # authentation (nor for authorization). We return a dummy response just to keep the device happy.
@@ -919,7 +935,7 @@ def HandleInitRequest():
             store_response_json = store_response.json()
             if "Resources" in store_response_json:
                 kobo_resources = store_response_json["Resources"]
-        except:
+        except Exception:
             log.error("Failed to receive or parse response from Kobo's init endpoint. Falling back to un-proxied mode.")
     if not kobo_resources:
         kobo_resources = NATIVE_KOBO_RESOURCES()
@@ -976,6 +992,13 @@ def HandleInitRequest():
     return response
 
 
+@kobo.route("/download/<book_id>/<book_format>")
+@requires_kobo_auth
+@download_required
+def download_book(book_id, book_format):
+    return get_download_link(book_id, book_format, "kobo")
+
+
 def NATIVE_KOBO_RESOURCES():
     return {
         "account_page": "https://secure.kobobooks.com/profile",
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 0f6cd174..8f18db49 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -64,11 +64,11 @@ from datetime import datetime
 from os import urandom
 
 from flask import g, Blueprint, url_for, abort, request
-from flask_login import login_user, login_required
+from flask_login import login_user, current_user, login_required
 from flask_babel import gettext as _
 
-from . import logger, ub, lm
-from .web import render_title_template
+from . import logger, config, calibre_db, db, helper, ub, lm
+from .render_template import render_title_template
 
 try:
     from functools import wraps
@@ -147,7 +147,15 @@ def generate_auth_token(user_id):
             auth_token.token_type = 1
 
             ub.session.add(auth_token)
-            ub.session.commit()
+            ub.session_commit()
+
+        books = calibre_db.session.query(db.Books).join(db.Data).all()
+
+        for book in books:
+            formats = [data.format for data in book.data]
+            if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
+                helper.convert_book_format(book.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.nickname)
+
         return render_title_template(
             "generate_kobo_auth_url.html",
             title=_(u"Kobo Setup"),
@@ -164,5 +172,5 @@ 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()
-    return ""
+
+    return ub.session_commit()
diff --git a/cps/logger.py b/cps/logger.py
index f13d75d3..b204de31 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -41,10 +41,37 @@ logging.addLevelName(logging.WARNING, "WARN")
 logging.addLevelName(logging.CRITICAL, "CRIT")
 
 
+class _Logger(logging.Logger):
+
+    def debug_or_exception(self, message, *args, **kwargs):
+        if sys.version_info > (3, 7):
+            if is_debug_enabled():
+                self.exception(message, stacklevel=2, *args, **kwargs)
+            else:
+                self.error(message, stacklevel=2, *args, **kwargs)
+        elif sys.version_info > (3, 0):
+            if is_debug_enabled():
+                self.exception(message, stack_info=True, *args, **kwargs)
+            else:
+                self.error(message, *args, **kwargs)
+        else:
+            if is_debug_enabled():
+                self.exception(message, *args, **kwargs)
+            else:
+                self.error(message, *args, **kwargs)
+
+
+    def debug_no_auth(self, message, *args, **kwargs):
+        if message.startswith("send: AUTH"):
+            self.debug(message[:16], stacklevel=2, *args, **kwargs)
+        else:
+            self.debug(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 +81,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 +125,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
@@ -126,11 +153,11 @@ def setup(log_file, log_level=None):
             file_handler.baseFilename = log_file
     else:
         try:
-            file_handler = RotatingFileHandler(log_file, maxBytes=50000, backupCount=2)
+            file_handler = RotatingFileHandler(log_file, maxBytes=50000, backupCount=2, encoding='utf-8')
         except IOError:
             if log_file == DEFAULT_LOG_FILE:
                 raise
-            file_handler = RotatingFileHandler(DEFAULT_LOG_FILE, maxBytes=50000, backupCount=2)
+            file_handler = RotatingFileHandler(DEFAULT_LOG_FILE, maxBytes=50000, backupCount=2, encoding='utf-8')
             log_file = ""
     file_handler.setFormatter(FORMATTER)
 
@@ -152,11 +179,11 @@ def create_access_log(log_file, log_name, formatter):
     access_log.propagate = False
     access_log.setLevel(logging.INFO)
     try:
-        file_handler = RotatingFileHandler(log_file, maxBytes=50000, backupCount=2)
+        file_handler = RotatingFileHandler(log_file, maxBytes=50000, backupCount=2, encoding='utf-8')
     except IOError:
         if log_file == DEFAULT_ACCESS_LOG:
             raise
-        file_handler = RotatingFileHandler(DEFAULT_ACCESS_LOG, maxBytes=50000, backupCount=2)
+        file_handler = RotatingFileHandler(DEFAULT_ACCESS_LOG, maxBytes=50000, backupCount=2, encoding='utf-8')
         log_file = ""
 
     file_handler.setFormatter(formatter)
diff --git a/cps/oauth.py b/cps/oauth.py
index 67ef2703..a8995180 100644
--- a/cps/oauth.py
+++ b/cps/oauth.py
@@ -19,7 +19,6 @@
 from __future__ import division, print_function, unicode_literals
 from flask import session
 
-
 try:
     from flask_dance.consumer.backend.sqla import SQLAlchemyBackend, first, _get_real_user
     from sqlalchemy.orm.exc import NoResultFound
@@ -34,134 +33,131 @@ except ImportError:
     except ImportError:
         pass
 
-try:
-    class OAuthBackend(SQLAlchemyBackend):
-        """
-        Stores and retrieves OAuth tokens using a relational database through
-        the `SQLAlchemy`_ ORM.
 
-        .. _SQLAlchemy: https://www.sqlalchemy.org/
-        """
-        def __init__(self, model, session, provider_id,
-                     user=None, user_id=None, user_required=None, anon_user=None,
-                     cache=None):
-            self.provider_id = provider_id
-            super(OAuthBackend, self).__init__(model, session, user, user_id, user_required, anon_user, cache)
+class OAuthBackend(SQLAlchemyBackend):
+    """
+    Stores and retrieves OAuth tokens using a relational database through
+    the `SQLAlchemy`_ ORM.
 
-        def get(self, blueprint, user=None, user_id=None):
-            if self.provider_id + '_oauth_token' in session and session[self.provider_id + '_oauth_token'] != '':
-                return session[self.provider_id + '_oauth_token']
-            # check cache
-            cache_key = self.make_cache_key(blueprint=blueprint, user=user, user_id=user_id)
-            token = self.cache.get(cache_key)
-            if token:
-                return token
-
-            # if not cached, make database queries
-            query = (
-                self.session.query(self.model)
-                .filter_by(provider=self.provider_id)
-            )
-            uid = first([user_id, self.user_id, blueprint.config.get("user_id")])
-            u = first(_get_real_user(ref, self.anon_user)
-                      for ref in (user, self.user, blueprint.config.get("user")))
-
-            use_provider_user_id = False
-            if self.provider_id + '_oauth_user_id' in session and session[self.provider_id + '_oauth_user_id'] != '':
-                query = query.filter_by(provider_user_id=session[self.provider_id + '_oauth_user_id'])
-                use_provider_user_id = True
-
-            if self.user_required and not u and not uid and not use_provider_user_id:
-                # raise ValueError("Cannot get OAuth token without an associated user")
-                return None
-            # check for user ID
-            if hasattr(self.model, "user_id") and uid:
-                query = query.filter_by(user_id=uid)
-            # check for user (relationship property)
-            elif hasattr(self.model, "user") and u:
-                query = query.filter_by(user=u)
-            # if we have the property, but not value, filter by None
-            elif hasattr(self.model, "user_id"):
-                query = query.filter_by(user_id=None)
-            # run query
-            try:
-                token = query.one().token
-            except NoResultFound:
-                token = None
-
-            # cache the result
-            self.cache.set(cache_key, token)
+    .. _SQLAlchemy: https://www.sqlalchemy.org/
+    """
+    def __init__(self, model, session, provider_id,
+                 user=None, user_id=None, user_required=None, anon_user=None,
+                 cache=None):
+        self.provider_id = provider_id
+        super(OAuthBackend, self).__init__(model, session, user, user_id, user_required, anon_user, cache)
 
+    def get(self, blueprint, user=None, user_id=None):
+        if self.provider_id + '_oauth_token' in session and session[self.provider_id + '_oauth_token'] != '':
+            return session[self.provider_id + '_oauth_token']
+        # check cache
+        cache_key = self.make_cache_key(blueprint=blueprint, user=user, user_id=user_id)
+        token = self.cache.get(cache_key)
+        if token:
             return token
 
-        def set(self, blueprint, token, user=None, user_id=None):
-            uid = first([user_id, self.user_id, blueprint.config.get("user_id")])
-            u = first(_get_real_user(ref, self.anon_user)
-                      for ref in (user, self.user, blueprint.config.get("user")))
+        # if not cached, make database queries
+        query = (
+            self.session.query(self.model)
+            .filter_by(provider=self.provider_id)
+        )
+        uid = first([user_id, self.user_id, blueprint.config.get("user_id")])
+        u = first(_get_real_user(ref, self.anon_user)
+                  for ref in (user, self.user, blueprint.config.get("user")))
 
-            if self.user_required and not u and not uid:
-                raise ValueError("Cannot set OAuth token without an associated user")
+        use_provider_user_id = False
+        if self.provider_id + '_oauth_user_id' in session and session[self.provider_id + '_oauth_user_id'] != '':
+            query = query.filter_by(provider_user_id=session[self.provider_id + '_oauth_user_id'])
+            use_provider_user_id = True
 
-            # if there was an existing model, delete it
-            existing_query = (
-                self.session.query(self.model)
-                .filter_by(provider=self.provider_id)
-            )
-            # check for user ID
-            has_user_id = hasattr(self.model, "user_id")
-            if has_user_id and uid:
-                existing_query = existing_query.filter_by(user_id=uid)
-            # check for user (relationship property)
-            has_user = hasattr(self.model, "user")
-            if has_user and u:
-                existing_query = existing_query.filter_by(user=u)
-            # queue up delete query -- won't be run until commit()
-            existing_query.delete()
-            # create a new model for this token
-            kwargs = {
-                "provider": self.provider_id,
-                "token": token,
-            }
-            if has_user_id and uid:
-                kwargs["user_id"] = uid
-            if has_user and u:
-                kwargs["user"] = u
-            self.session.add(self.model(**kwargs))
-            # commit to delete and add simultaneously
-            self.session.commit()
-            # invalidate cache
-            self.cache.delete(self.make_cache_key(
-                blueprint=blueprint, user=user, user_id=user_id
-            ))
+        if self.user_required and not u and not uid and not use_provider_user_id:
+            # raise ValueError("Cannot get OAuth token without an associated user")
+            return None
+        # check for user ID
+        if hasattr(self.model, "user_id") and uid:
+            query = query.filter_by(user_id=uid)
+        # check for user (relationship property)
+        elif hasattr(self.model, "user") and u:
+            query = query.filter_by(user=u)
+        # if we have the property, but not value, filter by None
+        elif hasattr(self.model, "user_id"):
+            query = query.filter_by(user_id=None)
+        # run query
+        try:
+            token = query.one().token
+        except NoResultFound:
+            token = None
 
-        def delete(self, blueprint, user=None, user_id=None):
-            query = (
-                self.session.query(self.model)
-                .filter_by(provider=self.provider_id)
-            )
-            uid = first([user_id, self.user_id, blueprint.config.get("user_id")])
-            u = first(_get_real_user(ref, self.anon_user)
-                      for ref in (user, self.user, blueprint.config.get("user")))
+        # cache the result
+        self.cache.set(cache_key, token)
 
-            if self.user_required and not u and not uid:
-                raise ValueError("Cannot delete OAuth token without an associated user")
+        return token
 
-            # check for user ID
-            if hasattr(self.model, "user_id") and uid:
-                query = query.filter_by(user_id=uid)
-            # check for user (relationship property)
-            elif hasattr(self.model, "user") and u:
-                query = query.filter_by(user=u)
-            # if we have the property, but not value, filter by None
-            elif hasattr(self.model, "user_id"):
-                query = query.filter_by(user_id=None)
-            # run query
-            query.delete()
-            self.session.commit()
-            # invalidate cache
-            self.cache.delete(self.make_cache_key(
-                blueprint=blueprint, user=user, user_id=user_id,
-            ))
+    def set(self, blueprint, token, user=None, user_id=None):
+        uid = first([user_id, self.user_id, blueprint.config.get("user_id")])
+        u = first(_get_real_user(ref, self.anon_user)
+                  for ref in (user, self.user, blueprint.config.get("user")))
 
-except Exception:
-    pass
+        if self.user_required and not u and not uid:
+            raise ValueError("Cannot set OAuth token without an associated user")
+
+        # if there was an existing model, delete it
+        existing_query = (
+            self.session.query(self.model)
+            .filter_by(provider=self.provider_id)
+        )
+        # check for user ID
+        has_user_id = hasattr(self.model, "user_id")
+        if has_user_id and uid:
+            existing_query = existing_query.filter_by(user_id=uid)
+        # check for user (relationship property)
+        has_user = hasattr(self.model, "user")
+        if has_user and u:
+            existing_query = existing_query.filter_by(user=u)
+        # queue up delete query -- won't be run until commit()
+        existing_query.delete()
+        # create a new model for this token
+        kwargs = {
+            "provider": self.provider_id,
+            "token": token,
+        }
+        if has_user_id and uid:
+            kwargs["user_id"] = uid
+        if has_user and u:
+            kwargs["user"] = u
+        self.session.add(self.model(**kwargs))
+        # commit to delete and add simultaneously
+        self.session.commit()
+        # invalidate cache
+        self.cache.delete(self.make_cache_key(
+            blueprint=blueprint, user=user, user_id=user_id
+        ))
+
+    def delete(self, blueprint, user=None, user_id=None):
+        query = (
+            self.session.query(self.model)
+            .filter_by(provider=self.provider_id)
+        )
+        uid = first([user_id, self.user_id, blueprint.config.get("user_id")])
+        u = first(_get_real_user(ref, self.anon_user)
+                  for ref in (user, self.user, blueprint.config.get("user")))
+
+        if self.user_required and not u and not uid:
+            raise ValueError("Cannot delete OAuth token without an associated user")
+
+        # check for user ID
+        if hasattr(self.model, "user_id") and uid:
+            query = query.filter_by(user_id=uid)
+        # check for user (relationship property)
+        elif hasattr(self.model, "user") and u:
+            query = query.filter_by(user=u)
+        # if we have the property, but not value, filter by None
+        elif hasattr(self.model, "user_id"):
+            query = query.filter_by(user_id=None)
+        # run query
+        query.delete()
+        self.session.commit()
+        # invalidate cache
+        self.cache.delete(self.make_cache_key(
+            blueprint=blueprint, user=user, user_id=user_id,
+        ))
diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py
index 4d489cdd..3fee2e04 100644
--- a/cps/oauth_bb.py
+++ b/cps/oauth_bb.py
@@ -30,12 +30,15 @@ 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 . import constants, logger, config, app, ub
-from .web import login_required
-from .oauth import OAuthBackend, backend_resultcode
+
+try:
+    from .oauth import OAuthBackend, backend_resultcode
+except NameError:
+    pass
 
 
 oauth_check = {}
@@ -84,11 +87,7 @@ def register_user_with_oauth(user=None):
             except NoResultFound:
                 # no found, return error
                 return
-            try:
-                ub.session.commit()
-            except Exception as e:
-                log.exception(e)
-                ub.session.rollback()
+            ub.session_commit("User {} with OAuth for provider {} registered".format(user.nickname, oauth_key))
 
 
 def logout_oauth_user():
@@ -100,16 +99,12 @@ def logout_oauth_user():
 if ub.oauth_support:
     oauthblueprints = []
     if not ub.session.query(ub.OAuthProvider).count():
-        oauthProvider = ub.OAuthProvider()
-        oauthProvider.provider_name = "github"
-        oauthProvider.active = False
-        ub.session.add(oauthProvider)
-        ub.session.commit()
-        oauthProvider = ub.OAuthProvider()
-        oauthProvider.provider_name = "google"
-        oauthProvider.active = False
-        ub.session.add(oauthProvider)
-        ub.session.commit()
+        for provider in ("github", "google"):
+            oauthProvider = ub.OAuthProvider()
+            oauthProvider.provider_name = provider
+            oauthProvider.active = False
+            ub.session.add(oauthProvider)
+            ub.session_commit("{} Blueprint Created".format(provider))
 
     oauth_ids = ub.session.query(ub.OAuthProvider).all()
     ele1 = dict(provider_name='github',
@@ -199,12 +194,8 @@ if ub.oauth_support:
                 provider_user_id=provider_user_id,
                 token=token,
             )
-        try:
-            ub.session.add(oauth_entry)
-            ub.session.commit()
-        except Exception as e:
-            log.exception(e)
-            ub.session.rollback()
+        ub.session.add(oauth_entry)
+        ub.session_commit()
 
         # Disable Flask-Dance's default behavior for saving the OAuth token
         # Value differrs depending on flask-dance version
@@ -235,7 +226,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 +273,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 78d5d8ed..c66ee836 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -25,7 +25,7 @@ import sys
 import datetime
 from functools import wraps
 
-from flask import Blueprint, request, render_template, Response, g, make_response
+from flask import Blueprint, request, render_template, Response, g, make_response, abort
 from flask_login import current_user
 from sqlalchemy.sql.expression import func, text, or_, and_
 from werkzeug.security import check_password_hash
@@ -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
+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
@@ -51,7 +52,7 @@ def requires_basic_auth_if_no_ano(f):
             if not auth or auth.type != 'basic' or not check_auth(auth.username, auth.password):
                 return authenticate()
         return f(*args, **kwargs)
-    if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
+    if config.config_login_type == constants.LOGIN_LDAP and services.ldap and config.config_anonbrowse != 1:
         return services.ldap.basic_auth_required(f)
     return decorated
 
@@ -100,7 +101,7 @@ def feed_normal_search():
 @requires_basic_auth_if_no_ano
 def feed_new():
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books, True, [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -118,7 +119,7 @@ def feed_discover():
 @requires_basic_auth_if_no_ano
 def feed_best_rated():
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
                                                         [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@@ -164,7 +165,7 @@ def feed_authorindex():
 @requires_basic_auth_if_no_ano
 def feed_author(book_id):
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.authors.any(db.Authors.id == book_id),
                                                         [db.Books.timestamp.desc()])
@@ -190,7 +191,7 @@ def feed_publisherindex():
 @requires_basic_auth_if_no_ano
 def feed_publisher(book_id):
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.publishers.any(db.Publishers.id == book_id),
                                                         [db.Books.timestamp.desc()])
@@ -218,7 +219,7 @@ def feed_categoryindex():
 @requires_basic_auth_if_no_ano
 def feed_category(book_id):
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.tags.any(db.Tags.id == book_id),
                                                         [db.Books.timestamp.desc()])
@@ -245,7 +246,7 @@ def feed_seriesindex():
 @requires_basic_auth_if_no_ano
 def feed_series(book_id):
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.series.any(db.Series.id == book_id),
                                                         [db.Books.series_index])
@@ -276,7 +277,7 @@ def feed_ratingindex():
 @requires_basic_auth_if_no_ano
 def feed_ratings(book_id):
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.ratings.any(db.Ratings.id == book_id),
                                                         [db.Books.timestamp.desc()])
@@ -304,7 +305,7 @@ def feed_formatindex():
 @requires_basic_auth_if_no_ano
 def feed_format(book_id):
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.data.any(db.Data.format == book_id.upper()),
                                                         [db.Books.timestamp.desc()])
@@ -338,7 +339,7 @@ def feed_languagesindex():
 @requires_basic_auth_if_no_ano
 def feed_languages(book_id):
     off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.languages.any(db.Languages.id == book_id),
                                                         [db.Books.timestamp.desc()])
@@ -383,8 +384,13 @@ def feed_shelf(book_id):
 
 @opds.route("/opds/download/<book_id>/<book_format>/")
 @requires_basic_auth_if_no_ano
-@download_required
 def opds_download_link(book_id, book_format):
+    # I gave up with this: With enabled ldap login, the user doesn't get logged in, therefore it's always guest
+    # workaround, loading the user from the request and checking it's download rights here
+    # in case of anonymous browsing user is None
+    user = load_user_from_request(request) or current_user
+    if not user.role_download():
+        return abort(403)
     if "Kobo" in request.headers.get('User-Agent'):
         client = "kobo"
     else:
@@ -408,7 +414,7 @@ def get_metadata_calibre_companion(uuid, library):
 
 def feed_search(term):
     if term:
-        entries = calibre_db.get_search_results(term)
+        entries, __, ___ = calibre_db.get_search_results(term)
         entriescount = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entriescount, entriescount)
         return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
@@ -418,10 +424,18 @@ def feed_search(term):
 
 def check_auth(username, password):
     if sys.version_info.major == 3:
-        username = username.encode('windows-1252')
+        try:
+            username = username.encode('windows-1252')
+        except UnicodeEncodeError:
+            username = username.encode('utf-8')
     user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) ==
                                             username.decode('utf-8').lower()).first()
-    return bool(user and check_password_hash(str(user.password), password))
+    if bool(user and check_password_hash(str(user.password), password)):
+        return True
+    else:
+        ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr)
+        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ipAdress)
+        return False
 
 
 def authenticate():
diff --git a/cps/remotelogin.py b/cps/remotelogin.py
new file mode 100644
index 00000000..d9e7388f
--- /dev/null
+++ b/cps/remotelogin.py
@@ -0,0 +1,138 @@
+# -*- 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
+    elif 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("User {} logged in via remotelogin, token deleted".format(user.nickname))
+
+        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..fdd8abb7
--- /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": _('Books'), "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/server.py b/cps/server.py
index 7c2d321d..ac821b31 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -22,11 +22,14 @@ import os
 import errno
 import signal
 import socket
+import subprocess
 
 try:
     from gevent.pywsgi import WSGIServer
     from gevent.pool import Pool
     from gevent import __version__ as _version
+    from greenlet import GreenletExit
+    import ssl
     VERSION = 'Gevent ' + _version
     _GEVENT = True
 except ImportError:
@@ -134,6 +137,64 @@ class WebServer(object):
 
         return sock, _readable_listen_address(*address)
 
+    @staticmethod
+    def _get_args_for_reloading():
+        """Determine how the script was executed, and return the args needed
+        to execute it again in a new process.
+        Code from https://github.com/pyload/pyload. Author GammaC0de, voulter
+        """
+        rv = [sys.executable]
+        py_script = sys.argv[0]
+        args = sys.argv[1:]
+        # Need to look at main module to determine how it was executed.
+        __main__ = sys.modules["__main__"]
+
+        # The value of __package__ indicates how Python was called. It may
+        # not exist if a setuptools script is installed as an egg. It may be
+        # set incorrectly for entry points created with pip on Windows.
+        if getattr(__main__, "__package__", None) is None or (
+            os.name == "nt"
+            and __main__.__package__ == ""
+            and not os.path.exists(py_script)
+            and os.path.exists("{}.exe".format(py_script))
+        ):
+            # Executed a file, like "python app.py".
+            py_script = os.path.abspath(py_script)
+
+            if os.name == "nt":
+                # Windows entry points have ".exe" extension and should be
+                # called directly.
+                if not os.path.exists(py_script) and os.path.exists("{}.exe".format(py_script)):
+                    py_script += ".exe"
+
+                if (
+                        os.path.splitext(sys.executable)[1] == ".exe"
+                        and os.path.splitext(py_script)[1] == ".exe"
+                ):
+                    rv.pop(0)
+
+            rv.append(py_script)
+        else:
+            # Executed a module, like "python -m module".
+            if sys.argv[0] == "-m":
+                args = sys.argv
+            else:
+                if os.path.isfile(py_script):
+                    # Rewritten by Python from "-m script" to "/path/to/script.py".
+                    py_module = __main__.__package__
+                    name = os.path.splitext(os.path.basename(py_script))[0]
+
+                    if name != "__main__":
+                        py_module += ".{}".format(name)
+                else:
+                    # Incorrectly rewritten by pydevd debugger from "-m script" to "script".
+                    py_module = py_script
+
+                rv.extend(("-m", py_module.lstrip(".")))
+
+        rv.extend(args)
+        return rv
+
     def _start_gevent(self):
         ssl_args = self.ssl_args or {}
 
@@ -143,6 +204,16 @@ class WebServer(object):
                 output = _readable_listen_address(self.listen_address, self.listen_port)
             log.info('Starting Gevent server on %s', output)
             self.wsgiserver = WSGIServer(sock, self.app, log=self.access_logger, spawn=Pool(), **ssl_args)
+            if ssl_args:
+                wrap_socket = self.wsgiserver.wrap_socket
+                def my_wrap_socket(*args, **kwargs):
+                    try:
+                        return wrap_socket(*args, **kwargs)
+                    except (ssl.SSLError, OSError) as ex:
+                        log.warning('Gevent SSL Error: %s', ex)
+                        raise GreenletExit
+
+                self.wsgiserver.wrap_socket = my_wrap_socket
             self.wsgiserver.serve_forever()
         finally:
             if self.unix_socket_file:
@@ -187,22 +258,16 @@ class WebServer(object):
             return True
 
         log.info("Performing restart of Calibre-Web")
-        arguments = list(sys.argv)
-        arguments.insert(0, sys.executable)
-        if os.name == 'nt':
-            arguments = ["\"%s\"" % a for a in arguments]
-        os.execv(sys.executable, arguments)
+        args = self._get_args_for_reloading()
+        subprocess.call(args, close_fds=True)
         return True
 
-    def _killServer(self, ignored_signum, ignored_frame):
+    def _killServer(self, __, ___):
         self.stop()
 
     def stop(self, restart=False):
         from . import updater_thread
         updater_thread.stop()
-        from . import calibre_db
-        calibre_db.stop()
-
 
         log.info("webserver stop (restart=%s)", restart)
         self.restart = restart
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index f6db960b..da5d93a3 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -64,7 +64,7 @@ class SyncToken:
         books_last_modified: Datetime representing the last modified book that the device knows about.
     """
 
-    SYNC_TOKEN_HEADER = "x-kobo-synctoken"
+    SYNC_TOKEN_HEADER = "x-kobo-synctoken"  # nosec
     VERSION = "1-1-0"
     LAST_MODIFIED_ADDED_VERSION = "1-1-0"
     MIN_VERSION = "1-0-0"
@@ -85,17 +85,19 @@ 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}
         },
     }
 
     def __init__(
         self,
-        raw_kobo_store_token="",
+        raw_kobo_store_token="",  # nosec
         books_last_created=datetime.min,
         books_last_modified=datetime.min,
         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,11 +105,12 @@ 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):
         sync_token_header = headers.get(SyncToken.SYNC_TOKEN_HEADER, "")
-        if sync_token_header == "":
+        if sync_token_header == "":  # nosec
             return SyncToken()
 
         # On the first sync from a Kobo device, we may receive the SyncToken
@@ -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/goodreads_support.py b/cps/services/goodreads_support.py
index 58255f3c..9312bc0f 100644
--- a/cps/services/goodreads_support.py
+++ b/cps/services/goodreads_support.py
@@ -72,7 +72,7 @@ def get_author_info(author_name):
         author_info = _client.find_author(author_name=author_name)
     except Exception as ex:
         # Skip goodreads, if site is down/inaccessible
-        log.warning('Goodreads website is down/inaccessible? %s', ex)
+        log.warning('Goodreads website is down/inaccessible? %s', ex.__str__())
         return
 
     if author_info:
diff --git a/cps/services/simpleldap.py b/cps/services/simpleldap.py
index 336b0f2c..4125bdab 100644
--- a/cps/services/simpleldap.py
+++ b/cps/services/simpleldap.py
@@ -20,7 +20,7 @@ from __future__ import division, print_function, unicode_literals
 import base64
 
 from flask_simpleldap import LDAP, LDAPException
-
+from flask_simpleldap import ldap as pyLDAP
 from .. import constants, logger
 
 try:
@@ -38,6 +38,7 @@ def init_app(app, config):
 
     app.config['LDAP_HOST'] = config.config_ldap_provider_url
     app.config['LDAP_PORT'] = config.config_ldap_port
+    app.config['LDAP_CUSTOM_OPTIONS'] = {pyLDAP.OPT_REFERRALS: 0}
     if config.config_ldap_encryption == 2:
         app.config['LDAP_SCHEMA'] = 'ldaps'
     else:
@@ -54,8 +55,14 @@ def init_app(app, config):
         app.config['LDAP_USERNAME'] = ""
         app.config['LDAP_PASSWORD'] = base64.b64decode("")
     if bool(config.config_ldap_cert_path):
-        app.config['LDAP_REQUIRE_CERT'] = True
-        app.config['LDAP_CERT_PATH'] = config.config_ldap_cert_path
+        app.config['LDAP_CUSTOM_OPTIONS'].update({
+            pyLDAP.OPT_X_TLS_REQUIRE_CERT: pyLDAP.OPT_X_TLS_DEMAND,
+            pyLDAP.OPT_X_TLS_CACERTFILE: config.config_ldap_cacert_path,
+            pyLDAP.OPT_X_TLS_CERTFILE: config.config_ldap_cert_path,
+            pyLDAP.OPT_X_TLS_KEYFILE: config.config_ldap_key_path,
+            pyLDAP.OPT_X_TLS_NEWCTX: 0
+            })
+
     app.config['LDAP_BASE_DN'] = config.config_ldap_dn
     app.config['LDAP_USER_OBJECT_FILTER'] = config.config_ldap_user_object
 
@@ -67,12 +74,19 @@ def init_app(app, config):
 
     try:
         _ldap.init_app(app)
+    except ValueError:
+        if bool(config.config_ldap_cert_path):
+            app.config['LDAP_CUSTOM_OPTIONS'].pop(pyLDAP.OPT_X_TLS_NEWCTX)
+        try:
+            _ldap.init_app(app)
+        except RuntimeError as e:
+            log.error(e)
     except RuntimeError as e:
         log.error(e)
 
 
-def get_object_details(user=None, group=None, query_filter=None, dn_only=False):
-    return _ldap.get_object_details(user, group, query_filter, dn_only)
+def get_object_details(user=None,query_filter=None):
+    return _ldap.get_object_details(user, query_filter=query_filter)
 
 
 def bind():
@@ -103,7 +117,7 @@ def bind_user(username, password):
         return None, error
     except LDAPException as ex:
         if ex.message == 'Invalid credentials':
-            error = ("LDAP admin login failed")
+            error = "LDAP admin login failed"
             return None, error
         if ex.message == "Can't contact LDAP server":
             # log.warning('LDAP Server down: %s', ex)
diff --git a/cps/services/worker.py b/cps/services/worker.py
new file mode 100644
index 00000000..072674a0
--- /dev/null
+++ b/cps/services/worker.py
@@ -0,0 +1,219 @@
+
+from __future__ import division, print_function, unicode_literals
+import threading
+import abc
+import uuid
+import time
+
+try:
+    import queue
+except ImportError:
+    import Queue as queue
+from datetime import datetime
+from collections import namedtuple
+
+from cps import logger
+
+log = logger.create()
+
+# task 'status' consts
+STAT_WAITING = 0
+STAT_FAIL = 1
+STAT_STARTED = 2
+STAT_FINISH_SUCCESS = 3
+
+# Only retain this many tasks in dequeued list
+TASK_CLEANUP_TRIGGER = 20
+
+QueuedTask = namedtuple('QueuedTask', 'num, user, added, task')
+
+
+def _get_main_thread():
+    for t in threading.enumerate():
+        if t.__class__.__name__ == '_MainThread':
+            return t
+    raise Exception("main thread not found?!")
+
+
+
+class ImprovedQueue(queue.Queue):
+    def to_list(self):
+        """
+        Returns a copy of all items in the queue without removing them.
+        """
+
+        with self.mutex:
+            return list(self.queue)
+
+#Class for all worker tasks in the background
+class WorkerThread(threading.Thread):
+    _instance = None
+
+    @classmethod
+    def getInstance(cls):
+        if cls._instance is None:
+            cls._instance = WorkerThread()
+        return cls._instance
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+        self.dequeued = list()
+
+        self.doLock = threading.Lock()
+        self.queue = ImprovedQueue()
+        self.num = 0
+        self.start()
+
+    @classmethod
+    def add(cls, user, task):
+        ins = cls.getInstance()
+        ins.num += 1
+        ins.queue.put(QueuedTask(
+            num=ins.num,
+            user=user,
+            added=datetime.now(),
+            task=task,
+        ))
+
+    @property
+    def tasks(self):
+        with self.doLock:
+            tasks = self.queue.to_list() + self.dequeued
+            return sorted(tasks, key=lambda x: x.num)
+
+    def cleanup_tasks(self):
+        with self.doLock:
+            dead = []
+            alive = []
+            for x in self.dequeued:
+                (dead if x.task.dead else alive).append(x)
+
+            # if the ones that we need to keep are within the trigger, do nothing else
+            delta = len(self.dequeued) - len(dead)
+            if delta > TASK_CLEANUP_TRIGGER:
+                ret = alive
+            else:
+                # otherwise, lop off the oldest dead tasks until we hit the target trigger
+                ret = sorted(dead, key=lambda x: x.task.end_time)[-TASK_CLEANUP_TRIGGER:] + alive
+
+            self.dequeued = sorted(ret, key=lambda x: x.num)
+
+    # Main thread loop starting the different tasks
+    def run(self):
+        main_thread = _get_main_thread()
+        while main_thread.is_alive():
+            try:
+                # this blocks until something is available. This can cause issues when the main thread dies - this
+                # thread will remain alive. We implement a timeout to unblock every second which allows us to check if
+                # the main thread is still alive.
+                # 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:
+                time.sleep(1)
+                continue
+
+            with self.doLock:
+                # add to list so that in-progress tasks show up
+                self.dequeued.append(item)
+
+            # once we hit our trigger, start cleaning up dead tasks
+            if len(self.dequeued) > TASK_CLEANUP_TRIGGER:
+                self.cleanup_tasks()
+
+            # sometimes tasks (like Upload) don't actually have work to do and are created as already finished
+            if item.task.stat is STAT_WAITING:
+                # CalibreTask.start() should wrap all exceptions in it's own error handling
+                item.task.start(self)
+
+            self.queue.task_done()
+
+
+class CalibreTask:
+    __metaclass__ = abc.ABCMeta
+
+    def __init__(self, message):
+        self._progress = 0
+        self.stat = STAT_WAITING
+        self.error = None
+        self.start_time = None
+        self.end_time = None
+        self.message = message
+        self.id = uuid.uuid4()
+
+    @abc.abstractmethod
+    def run(self, worker_thread):
+        """Provides the caller some human-readable name for this class"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def name(self):
+        """Provides the caller some human-readable name for this class"""
+        raise NotImplementedError
+
+    def start(self, *args):
+        self.start_time = datetime.now()
+        self.stat = STAT_STARTED
+
+        # catch any unhandled exceptions in a task and automatically fail it
+        try:
+            self.run(*args)
+        except Exception as e:
+            self._handleError(str(e))
+            log.debug_or_exception(e)
+
+        self.end_time = datetime.now()
+
+    @property
+    def stat(self):
+        return self._stat
+
+    @stat.setter
+    def stat(self, x):
+        self._stat = x
+
+    @property
+    def progress(self):
+        return self._progress
+
+    @progress.setter
+    def progress(self, x):
+        if not 0 <= x <= 1:
+            raise ValueError("Task progress should within [0, 1] range")
+        self._progress = x
+
+    @property
+    def error(self):
+        return self._error
+
+    @error.setter
+    def error(self, x):
+        self._error = x
+
+    @property
+    def runtime(self):
+        return (self.end_time or datetime.now()) - self.start_time
+
+    @property
+    def dead(self):
+        """Determines whether or not this task can be garbage collected
+
+        We have a separate dictating this because there may be certain tasks that want to override this
+        """
+        # By default, we're good to clean a task if it's "Done"
+        return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL)
+
+    @progress.setter
+    def progress(self, x):
+        # todo: throw error if outside of [0,1]
+        self._progress = x
+
+    def _handleError(self, error_message):
+        self.stat = STAT_FAIL
+        self.progress = 1
+        self.error = error_message
+
+    def _handleSuccess(self):
+        self.stat = STAT_FINISH_SUCCESS
+        self.progress = 1
diff --git a/cps/shelf.py b/cps/shelf.py
index 19a350d5..5c6037ac 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -22,15 +22,17 @@
 
 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 _
 from flask_login import login_required, current_user
-from sqlalchemy.sql.expression import func
+from sqlalchemy.sql.expression import func, true
 from sqlalchemy.exc import OperationalError, InvalidRequestError
 
-from . import logger, ub, searched_ids, 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__)
@@ -124,32 +126,28 @@ def search_to_shelf(shelf_id):
         flash(_(u"You are not allowed to add a book to the the shelf: %(name)s", name=shelf.name), category="error")
         return redirect(url_for('web.index'))
 
-    if current_user.id in searched_ids and searched_ids[current_user.id]:
+    if current_user.id in ub.searched_ids and ub.searched_ids[current_user.id]:
         books_for_shelf = list()
         books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).all()
         if books_in_shelf:
             book_ids = list()
             for book_id in books_in_shelf:
                 book_ids.append(book_id.book_id)
-            for searchid in searched_ids[current_user.id]:
+            for searchid in ub.searched_ids[current_user.id]:
                 if searchid not in book_ids:
                     books_for_shelf.append(searchid)
         else:
-            books_for_shelf = searched_ids[current_user.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:
@@ -223,96 +221,76 @@ def remove_from_shelf(shelf_id, book_id):
 @login_required
 def create_shelf():
     shelf = ub.Shelf()
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        if "is_public" in to_save:
-            shelf.is_public = 1
-        shelf.name = to_save["title"]
-        shelf.user_id = int(current_user.id)
-
-        is_shelf_name_unique = False
-        if shelf.is_public == 1:
-            is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1)) \
-                .first() is None
-
-            if not is_shelf_name_unique:
-                flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]),
-                      category="error")
-        else:
-            is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) &
-                        (ub.Shelf.user_id == int(current_user.id)))\
-                                       .first() is None
-
-            if not is_shelf_name_unique:
-                flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]),
-                      category="error")
-
-        if is_shelf_name_unique:
-            try:
-                ub.session.add(shelf)
-                ub.session.commit()
-                flash(_(u"Shelf %(title)s created", title=to_save["title"]), category="success")
-                return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
-            except (OperationalError, InvalidRequestError):
-                ub.session.rollback()
-                flash(_(u"Settings DB is not Writeable"), category="error")
-            except Exception:
-                ub.session.rollback()
-                flash(_(u"There was an error"), category="error")
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate")
-    else:
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate")
+    return create_edit_shelf(shelf, title=_(u"Create a Shelf"), page="shelfcreate")
 
 
 @shelf.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def edit_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
+    return create_edit_shelf(shelf, title=_(u"Edit a shelf"), page="shelfedit", shelf_id=shelf_id)
+
+
+# if shelf ID is set, we are editing a shelf
+def create_edit_shelf(shelf, title, page, shelf_id=False):
     if request.method == "POST":
         to_save = request.form.to_dict()
-
-        is_shelf_name_unique = False
-        if shelf.is_public == 1:
-            is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1)) \
-                .filter(ub.Shelf.id != shelf_id) \
-                .first() is None
-
-            if not is_shelf_name_unique:
-                flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]),
-                      category="error")
+        if "is_public" in to_save:
+            shelf.is_public = 1
         else:
-            is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) &
-                        (ub.Shelf.user_id == int(current_user.id)))\
-                                       .filter(ub.Shelf.id != shelf_id)\
-                                       .first() is None
-
-            if not is_shelf_name_unique:
-                flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]),
-                      category="error")
-
-        if is_shelf_name_unique:
+            shelf.is_public = 0
+        if check_shelf_is_unique(shelf, to_save, shelf_id):
             shelf.name = to_save["title"]
-            shelf.last_modified = datetime.utcnow()
-            if "is_public" in to_save:
-                shelf.is_public = 1
+            # shelf.last_modified = datetime.utcnow()
+            if not shelf_id:
+                shelf.user_id = int(current_user.id)
+                ub.session.add(shelf)
+                shelf_action = "created"
+                flash_text = _(u"Shelf %(title)s created", title=to_save["title"])
             else:
-                shelf.is_public = 0
+                shelf_action = "changed"
+                flash_text = _(u"Shelf %(title)s changed", title=to_save["title"])
             try:
                 ub.session.commit()
-                flash(_(u"Shelf %(title)s changed", title=to_save["title"]), category="success")
-            except (OperationalError, InvalidRequestError):
+                log.info(u"Shelf {} {}".format(to_save["title"], shelf_action))
+                flash(flash_text, category="success")
+                return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
+            except (OperationalError, InvalidRequestError) as e:
                 ub.session.rollback()
+                log.debug_or_exception(e)
                 flash(_(u"Settings DB is not Writeable"), category="error")
-            except Exception:
+            except Exception as e:
                 ub.session.rollback()
+                log.debug_or_exception(e)
                 flash(_(u"There was an error"), category="error")
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Edit a shelf"), page="shelfedit")
+    return render_title_template('shelf_edit.html', shelf=shelf, title=title, page=page)
+
+
+def check_shelf_is_unique(shelf, to_save, shelf_id=False):
+    if shelf_id:
+        ident = ub.Shelf.id != shelf_id
     else:
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Edit a shelf"), page="shelfedit")
+        ident = true()
+    if shelf.is_public == 1:
+        is_shelf_name_unique = ub.session.query(ub.Shelf) \
+                                   .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1)) \
+                                   .filter(ident) \
+                                   .first() is None
+
+        if not is_shelf_name_unique:
+            flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]),
+                  category="error")
+    else:
+        is_shelf_name_unique = ub.session.query(ub.Shelf) \
+                                   .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) &
+                                           (ub.Shelf.user_id == int(current_user.id))) \
+                                   .filter(ident) \
+                                   .first() is None
+
+        if not is_shelf_name_unique:
+            flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]),
+                  category="error")
+    return is_shelf_name_unique
 
 
 def delete_shelf_helper(cur_shelf):
@@ -322,9 +300,7 @@ 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)
-
+    ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
 
 
 @shelf.route("/shelf/delete/<int:shelf_id>")
@@ -333,44 +309,24 @@ 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 +350,79 @@ 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
+    ub.session_commit("Shelf-id:{} - Order changed".format(shelf_id))
+
+
+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.min.css b/cps/static/css/caliBlur.css
similarity index 98%
rename from cps/static/css/caliBlur.min.css
rename to cps/static/css/caliBlur.css
index 0714ea7c..ffa5ecca 100644
--- a/cps/static/css/caliBlur.min.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;
@@ -585,7 +581,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > .dow
     border-left: 2px solid rgba(0, 0, 0, .15)
 }
 
-div[aria-label="Edit/Delete book"] > .btn-warning {
+div[aria-label="Edit/Delete book"] > .btn {
     width: 50px;
     height: 60px;
     margin: 0;
@@ -600,7 +596,7 @@ div[aria-label="Edit/Delete book"] > .btn-warning {
     color: transparent
 }
 
-div[aria-label="Edit/Delete book"] > .btn-warning > span {
+div[aria-label="Edit/Delete book"] > .btn > span {
     visibility: visible;
     position: relative;
     display: inline-block;
@@ -616,16 +612,16 @@ div[aria-label="Edit/Delete book"] > .btn-warning > span {
     margin: auto
 }
 
-div[aria-label="Edit/Delete book"] > .btn-warning > span:before {
+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;
     height: 60px
 }
 
-div[aria-label="Edit/Delete book"] > .btn-warning > span:hover {
+div[aria-label="Edit/Delete book"] > .btn > span:hover {
     color: #fff
 }
 
@@ -637,7 +633,7 @@ div[aria-label="Edit/Delete book"] > .btn-warning > span:hover {
     color: var(--color-primary)
 }
 
-.book {
+/* .book {
     width: 225px;
     max-width: 225px;
     position: relative !important;
@@ -648,7 +644,7 @@ div[aria-label="Edit/Delete book"] > .btn-warning > span:hover {
     transform: none !important;
     min-width: 225px;
     display: block
-}
+} */
 
 #infscr-loading img, body > div.container-fluid > div > div.col-sm-10 > div.discover > div.isotope:after, body > div.container-fluid > div > div.col-sm-10 > div.discover > div.isotope:before {
     display: none
@@ -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 {
@@ -831,7 +827,10 @@ body:not(.read-frame) {
     font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
     font-weight: 400;
     overflow: hidden;
-    margin: 0
+    margin: 0;
+    /* scroll bar fix for firefox  */
+    scrollbar-color: hsla(0, 0%, 100%, .2) transparent;
+    scrollbar-width: thin;
 }
 
 body > div.navbar.navbar-default.navbar-static-top > div > form > div {
@@ -963,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;
@@ -988,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);
@@ -1016,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;
@@ -1072,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;
@@ -1094,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;
@@ -1117,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;
@@ -1190,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
 }
 
@@ -1269,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
 }
 
@@ -1349,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
 }
 
@@ -1420,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
@@ -1458,7 +1457,8 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
     -webkit-box-shadow: 0 0 2px rgba(0, 0, 0, .35);
     box-shadow: 0 0 2px rgba(0, 0, 0, .35);
     position: relative;
-    z-index: -9
+    z-index: -9;
+    width: 150px !important;
 }
 
 #books > .cover > a, #books_rand > .cover > a, .book.isotope-item > .cover > a, 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 {
@@ -1469,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;
@@ -1517,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
 }
@@ -1558,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%)
 }
 
@@ -1735,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;
@@ -1939,15 +1939,18 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > form > .btn.bt
     z-index: 99999
 }
 
-.pagination:after, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous {
+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;
     height: 60px;
     font-style: normal;
-    -moz-osx-font-smoothing: grayscale
+    -moz-osx-font-smoothing: grayscale;
+    overflow: hidden;
 }
 
 .pagination > a {
@@ -1967,68 +1970,46 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > form > .btn.bt
     color: #fff !important
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous + a, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a[href*=page] {
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-item:not(.page-next):not(.page-previous)
+{
     display: none
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous {
+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 {
     color: transparent;
+    background-color:transparent;
     margin-left: 0;
     width: 65px;
     padding: 0;
     font-size: 15px;
-    position: absolute;
-    display: block !important
+    display: block !important;
+    border: none;
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next {
-    right: 0
-}
-
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous {
-    right: 65px
-}
-
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next:before {
-    content: "\EA32";
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-next > a:before,
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previous > a:before {
     visibility: visible;
     color: hsla(0, 0%, 100%, .35);
     height: 60px;
     line-height: 60px;
     border-left: 2px solid transparent;
     font-size: 20px;
-    padding: 20px 0 20px 20px;
-    margin-right: -27px
+    padding: 20px 25px;
+    margin-right: -27px;
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous:before {
-    content: "\EA33";
-    visibility: visible;
-    color: hsla(0, 0%, 100%, .65);
-    height: 60px;
-    line-height: 60px;
-    font-size: 20px;
-    padding: 20px 25px
-}
-
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next:hover:before, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous:hover:before {
-    color: #fff
-}
-
-.pagination > strong {
-    display: none
-}
-
-.pagination:after {
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-next > a:before {
     content: "\EA32";
-    position: relative;
-    right: 0;
-    display: inline-block;
-    color: hsla(0, 0%, 100%, .55);
-    font-size: 20px;
-    padding: 0 23px;
-    margin-left: 20px;
-    z-index: -1
+}
+
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previous > a:before {
+    content: "\EA33";
+}
+
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-next > a:hover:before,
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previous > a:hover:before {
+    color: #fff
 }
 
 .pagination > .ellipsis, .pagination > a:nth-last-of-type(2) {
@@ -2041,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;
@@ -2138,15 +2119,14 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container
     transition: all 0s
 }
 
-
-.book-meta > .bookinfo > .tags .btn-info, .well > form > .btn {
+.well > form > .btn {
     vertical-align: middle;
     -o-transition: background-color .2s, color .2s
 }
 
 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;
@@ -2166,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;
@@ -2193,7 +2173,7 @@ body.langlist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e034"
 }
 
-body.advsearch > div.container-fluid > div > div.col-sm-10:before, body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
     top: 60px;
     font-size: 24px;
     color: #eee;
@@ -2263,10 +2243,14 @@ body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before
     content: "Languages"
 }
 
-body.advsearch > div.container-fluid > div > div.col-sm-10:before {
-    content: "Advanced Search";
-    margin-left: 20%;
-    left: 0
+body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
+    padding: 15px 10px 15px 40px;
+}
+
+@media screen and (max-width: 992px) {
+    body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
+        padding-left: 20px;
+    }
 }
 
 body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before {
@@ -2503,7 +2487,6 @@ body > div.container-fluid > div > div.col-sm-10 > div.col-sm-8 > form > .btn.bt
 }
 
 textarea {
-    resize: none;
     resize: vertical
 }
 
@@ -2849,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;
@@ -2949,7 +2932,6 @@ body > div.container-fluid > div > div.col-sm-10 > div > div > div.col-sm-3.col-
 #bookDetailsModal > .modal-dialog.modal-lg > .modal-content > .modal-body > div > div > div > div.col-sm-3.col-lg-3.col-xs-5 > div.cover, body > div.container-fluid > div > div.col-sm-10 > div > div > div.col-sm-3.col-lg-3.col-xs-5 > div.cover {
     margin: 0;
     width: 100%;
-    height: 100%
 }
 
 #bookDetailsModal > .modal-dialog.modal-lg > .modal-content > .modal-body > div > div > div > div.col-sm-3.col-lg-3.col-xs-5 > div.cover > img, body > div.container-fluid > div > div.col-sm-10 > div > div > div.col-sm-3.col-lg-3.col-xs-5 > div.cover > img {
@@ -2974,46 +2956,35 @@ body > div.container-fluid > div > div.col-sm-10 > div > div > div.col-sm-3.col-
     margin-top: 24px
 }
 
-.book-meta > .bookinfo > .publishers > span:first-of-type, .book-meta > .bookinfo > .publishing-date > span:first-of-type {
+.book-meta > .bookinfo > .languages > span:first-of-type,
+.book-meta > .bookinfo > .publishers > span:first-of-type,
+.book-meta > .bookinfo > .publishing-date > span:first-of-type,
+.real_custom_columns > span:first-of-type {
     color: hsla(0, 0%, 100%, .45);
     text-transform: uppercase;
-    font-family: Open Sans Bold, Helvetica Neue, Helvetica, Arial, sans-serif
+    font-family: Open Sans Bold, Helvetica Neue, Helvetica, Arial, sans-serif;
+    width: 200px;
+    display: inline-block
 }
 
-.book-meta > .bookinfo > .publishers > span:last-of-type, .book-meta > .bookinfo > .publishing-date > span:last-of-type {
+.book-meta > .bookinfo > .languages > span:last-of-type,
+.book-meta > .bookinfo > .publishers > span:last-of-type,
+.book-meta > .bookinfo > .publishing-date > span:last-of-type,
+.real_custom_columns > span:last-of-type {
     font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
     color: #fff;
     font-size: 15px;
     -webkit-font-smoothing: antialiased
 }
 
-.book-meta > .bookinfo > .publishers > span:last-of-type {
-    padding-left: 90px
+.book-meta > .bookinfo > .languages > span > a,
+.book-meta > .bookinfo > .publishers > span > a,
+.book-meta > .bookinfo > .publishing-date > span > a,
+.real_custom_columns > span > a {
+    color: #fff
 }
 
-.real_custom_columns > span:last-of-type {
-    padding-left: 90px
-}
-
-.book-meta > .bookinfo > .publishing-date > span:last-of-type {
-    padding-left: 90px
-}
-
-.book-meta > .bookinfo > .languages > span:first-of-type {
-    color: hsla(0, 0%, 100%, .45);
-    text-transform: uppercase;
-    font-family: Open Sans Bold, Helvetica Neue, Helvetica, Arial, sans-serif
-}
-
-.book-meta > .bookinfo > .languages > span:last-of-type {
-    font-size: 15px;
-    font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
-    -webkit-font-smoothing: antialiased;
-    color: #fff;
-    padding-left: 85px
-}
-
-.book-meta > .bookinfo > .tags .btn-info, .book-meta > h2, body.book .author {
+.book-meta > h2, body.book .author {
     font-family: Open Sans Bold, Helvetica Neue, Helvetica, Arial, sans-serif
 }
 
@@ -3094,34 +3065,10 @@ body.book .author {
     background-color: rgba(0, 0, 0, .3)
 }
 
-.book-meta > .bookinfo > .identifiers > p > .btn-success, .book-meta > .bookinfo > .tags .btn-info {
-    overflow: hidden;
-    text-align: center;
-    white-space: nowrap;
-    margin: 2px 3px 0 0;
-    padding: 0 10px
-}
-
-.book-meta > .bookinfo > .tags .btn-info {
-    background-color: rgba(0, 0, 0, .15);
-    color: hsla(0, 0%, 100%, .7);
-    font-size: 13px;
-    display: inline-block;
-    border-radius: 4px;
-    -webkit-transition: background-color .2s, color .2s;
-    transition: background-color .2s, color .2s;
-    text-transform: none
-}
-
 .dropdown-menu, .tooltip.in {
     -webkit-transition: opacity .15s ease-out, -webkit-transform .15s cubic-bezier(.6, .4, .2, 1.4)
 }
 
-.book-meta > .bookinfo > .tags .btn-info:hover {
-    color: #fff;
-    text-decoration: underline
-}
-
 .book-meta > .bookinfo > .identifiers, .book-meta > .bookinfo > .tags {
     padding-left: 40px;
     margin: 10px 0
@@ -3207,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
 }
 
@@ -3219,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
 }
@@ -3231,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 {
@@ -3335,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;
@@ -3363,7 +3309,8 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd
     box-shadow: none
 }
 
-.book-meta > .bookinfo > .identifiers > p > .btn-success {
+.book-meta > .bookinfo .btn-info,
+.book-meta > .bookinfo .btn-success {
     background-color: rgba(0, 0, 0, .15);
     color: hsla(0, 0%, 100%, .7);
     font-size: 13px;
@@ -3377,11 +3324,21 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd
     text-transform: none
 }
 
-.book-meta > .bookinfo > .identifiers > p > .btn-success:hover {
+.book-meta > .bookinfo .btn-info:hover,
+.book-meta > .bookinfo .btn-success:hover {
     color: #fff;
     text-decoration: underline
 }
 
+.book-meta > .bookinfo .btn-info,
+.book-meta > .bookinfo .btn-success {
+    overflow: hidden;
+    text-align: center;
+    white-space: nowrap;
+    margin: 2px 3px 0 0;
+    padding: 0 10px
+}
+
 #bookDetailsModal .book-meta {
     color: hsla(0, 0%, 100%, .7);
     height: calc(100% - 120px);
@@ -3453,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 {
@@ -3522,6 +3479,20 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > h2 {
     padding-right: 25px !important
 }
 
+body.shelf-down > .discover > h2 {
+    color: inherit;
+    margin-bottom: 20px;
+}
+
+body.shelf-down > .discover > .row > .book.col-sm-3.col-lg-2.col-xs-6 {
+    max-width: 225px !important;
+    width: 225px !important;
+}
+
+body.shelf-down .btn-group button#btnGroupDrop1 {
+    height: 50px;
+}
+
 .author > .container-fluid > .row-fluid > .col-sm-10 > h2:before, .plexBack > a {
     -moz-text-size-adjust: 100%;
     -ms-text-size-adjust: 100%;
@@ -3553,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;
@@ -3583,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;
@@ -3613,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;
@@ -3750,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;
@@ -3862,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
 }
@@ -3885,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
 }
@@ -3969,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;
@@ -4118,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
 }
@@ -4219,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
 }
@@ -4231,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;
@@ -4271,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;
@@ -4282,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);
@@ -4342,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
 }
 
@@ -4428,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;
@@ -4454,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;
@@ -4550,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;
@@ -4659,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%;
@@ -4697,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%)
 }
 
@@ -4750,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
 }
 
@@ -4819,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;
@@ -4885,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);
@@ -4985,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)
 }
@@ -5070,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
@@ -5078,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
@@ -5141,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;
@@ -5304,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
@@ -5464,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
@@ -5509,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;
@@ -5520,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);
@@ -5574,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 {
@@ -5980,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
     }
@@ -5992,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
     }
@@ -6071,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;
@@ -6223,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;
@@ -6241,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;
@@ -6294,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
@@ -6303,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;
@@ -6322,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;
@@ -6647,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;
@@ -6852,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;
@@ -6981,16 +6945,12 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         margin: 45px
     }
 
-    .book-meta > .bookinfo > .publishing-date > span:last-of-type {
-        padding-left: 25px
-    }
-
-    .book-meta > .bookinfo > .publishers > span:last-of-type {
-        padding-left: 70px
-    }
-
-    .book-meta > .bookinfo > .languages > span:last-of-type {
-        padding-left: 65px
+    .book-meta > .bookinfo > .languages > span:first-of-type,
+    .book-meta > .bookinfo > .publishers > span:first-of-type,
+    .book-meta > .bookinfo > .publishing-date > span:first-of-type,
+    .real_custom_columns > span:first-of-type {
+        width: 50%;
+        max-width: 200px;
     }
 
     .book-meta > .bookinfo .publishers {
@@ -7023,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
     }
@@ -7046,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;
@@ -7388,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
     }
@@ -7403,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;
@@ -7442,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 {
@@ -7553,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;
@@ -7573,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;
@@ -7599,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;
@@ -7774,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 {
@@ -7797,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;
@@ -7808,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);
@@ -7847,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 05a7c0d8..4c8b6cb0 100644
--- a/cps/static/css/caliBlur_override.css
+++ b/cps/static/css/caliBlur_override.css
@@ -1,17 +1,24 @@
-body.serieslist.grid-view div.container-fluid>div>div.col-sm-10:before{
-    display: none;
+body.serieslist.grid-view div.container-fluid > div > div.col-sm-10::before {
+  display: none;
 }
 
-.cover .badge{
-    position: absolute;
-    top: 0;
-    right: 0;
-    background-color: #cc7b19;
-    border-radius: 0;
-    padding: 0 8px;
-    box-shadow: 0 0 4px rgba(0,0,0,.6);
-    line-height: 24px;
+.cover .badge {
+  position: absolute;
+  top: 0;
+  left: 0;
+  color: #fff;
+  background-color: #cc7b19;
+  border-radius: 0;
+  padding: 0 8px;
+  box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
+  line-height: 24px;
 }
-.cover{
-    box-shadow: 0 0 4px rgba(0,0,0,.6);
+
+.cover {
+  box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
+}
+
+.cover .read {
+  padding: 0 0;
+  line-height: 15px;
 }
diff --git a/cps/static/css/kthoom.css b/cps/static/css/kthoom.css
index cc38740b..233cfe94 100644
--- a/cps/static/css/kthoom.css
+++ b/cps/static/css/kthoom.css
@@ -33,7 +33,6 @@ body {
   position: relative;
   cursor: pointer;
   padding: 4px;
-
   transition: all 0.2s ease;
 }
 
@@ -45,7 +44,7 @@ body {
 
 #sidebar a.active,
 #sidebar a.active img + span {
-  background-color: #45B29D;
+  background-color: #45b29d;
 }
 
 #sidebar li img {
@@ -99,7 +98,7 @@ body {
   background-color: #ccc;
 }
 
-#progress .bar-read  {
+#progress .bar-read {
   color: #fff;
   background-color: #45b29d;
 }
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/libs/bootstrap-table.min.css b/cps/static/css/libs/bootstrap-table.min.css
index 770b6728..72a8f74f 100644
--- a/cps/static/css/libs/bootstrap-table.min.css
+++ b/cps/static/css/libs/bootstrap-table.min.css
@@ -1 +1,10 @@
-.fixed-table-container .bs-checkbox,.fixed-table-container .no-records-found{text-align:center}.fixed-table-body thead th .th-inner,.table td,.table th{box-sizing:border-box}.bootstrap-table .table{margin-bottom:0!important;border-bottom:1px solid #ddd;border-collapse:collapse!important;border-radius:1px}.bootstrap-table .table:not(.table-condensed),.bootstrap-table .table:not(.table-condensed)>tbody>tr>td,.bootstrap-table .table:not(.table-condensed)>tbody>tr>th,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>td,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>th,.bootstrap-table .table:not(.table-condensed)>thead>tr>td{padding:8px}.bootstrap-table .table.table-no-bordered>tbody>tr>td,.bootstrap-table .table.table-no-bordered>thead>tr>th{border-right:2px solid transparent}.bootstrap-table .table.table-no-bordered>tbody>tr>td:last-child{border-right:none}.fixed-table-container{position:relative;clear:both;border:1px solid #ddd;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}.fixed-table-container.table-no-bordered{border:1px solid transparent}.fixed-table-footer,.fixed-table-header{overflow:hidden}.fixed-table-footer{border-top:1px solid #ddd}.fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.fixed-table-container table{width:100%}.fixed-table-container thead th{height:0;padding:0;margin:0;border-left:1px solid #ddd}.fixed-table-container thead th:focus{outline:transparent solid 0}.fixed-table-container thead th:first-child:not([data-not-first-th]){border-left:none;border-top-left-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px}.fixed-table-container tbody td .th-inner,.fixed-table-container thead th .th-inner{padding:8px;line-height:24px;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.fixed-table-container thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px}.fixed-table-container thead th .both{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC')}.fixed-table-container thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.fixed-table-container thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.fixed-table-container th.detail{width:30px}.fixed-table-container tbody td{border-left:1px solid #ddd}.fixed-table-container tbody tr:first-child td{border-top:none}.fixed-table-container tbody td:first-child{border-left:none}.fixed-table-container tbody .selected td{background-color:#f5f5f5}.fixed-table-container input[type=radio],.fixed-table-container input[type=checkbox]{margin:0 auto!important}.fixed-table-pagination .pagination-detail,.fixed-table-pagination div.pagination{margin-top:10px;margin-bottom:10px}.fixed-table-pagination div.pagination .pagination{margin:0}.fixed-table-pagination .pagination a{padding:6px 12px;line-height:1.428571429}.fixed-table-pagination .pagination-info{line-height:34px;margin-right:5px}.fixed-table-pagination .btn-group{position:relative;display:inline-block;vertical-align:middle}.fixed-table-pagination .dropup .dropdown-menu{margin-bottom:0}.fixed-table-pagination .page-list{display:inline-block}.fixed-table-toolbar .columns-left{margin-right:5px}.fixed-table-toolbar .columns-right{margin-left:5px}.fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.fixed-table-toolbar .bs-bars,.fixed-table-toolbar .columns,.fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px;line-height:34px}.fixed-table-pagination li.disabled a{pointer-events:none;cursor:default}.fixed-table-loading{display:none;position:absolute;top:42px;right:0;bottom:0;left:0;z-index:99;background-color:#fff;text-align:center}.fixed-table-body .card-view .title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.table td,.table th{vertical-align:middle}.fixed-table-toolbar .dropdown-menu{text-align:left;max-height:300px;overflow:auto}.fixed-table-toolbar .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.fixed-table-toolbar .btn-group>.btn-group>.btn{border-radius:0}.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .table>thead>tr>th{vertical-align:bottom;border-bottom:1px solid #ddd}.bootstrap-table .table thead>tr>th{padding:0;margin:0}.bootstrap-table .fixed-table-footer tbody>tr>td{padding:0!important}.bootstrap-table .fixed-table-footer .table{border-bottom:none;border-radius:0;padding:0!important}.bootstrap-table .pull-right .dropdown-menu{right:0;left:auto}p.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}.fixed-table-pagination:after,.fixed-table-toolbar:after{content:"";display:block;clear:both}.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#FFF}
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+.bootstrap-table .fixed-table-toolbar::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-toolbar .bs-bars,.bootstrap-table .fixed-table-toolbar .columns,.bootstrap-table .fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group>.btn{border-radius:0}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .dropdown-menu{text-align:left;max-height:300px;overflow:auto;-ms-overflow-style:scrollbar;z-index:1001}.bootstrap-table .fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.bootstrap-table .fixed-table-toolbar .columns-left{margin-right:5px}.bootstrap-table .fixed-table-toolbar .columns-right{margin-left:5px}.bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu{right:0;left:auto}.bootstrap-table .fixed-table-container{position:relative;clear:both}.bootstrap-table .fixed-table-container .table{width:100%;margin-bottom:0!important}.bootstrap-table .fixed-table-container .table td,.bootstrap-table .fixed-table-container .table th{vertical-align:middle;box-sizing:border-box}.bootstrap-table .fixed-table-container .table thead th{vertical-align:bottom;padding:0;margin:0}.bootstrap-table .fixed-table-container .table thead th:focus{outline:0 solid transparent}.bootstrap-table .fixed-table-container .table thead th.detail{width:30px}.bootstrap-table .fixed-table-container .table thead th .th-inner{padding:.75rem;vertical-align:bottom;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bootstrap-table .fixed-table-container .table thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px!important}.bootstrap-table .fixed-table-container .table thead th .both{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC")}.bootstrap-table .fixed-table-container .table thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.bootstrap-table .fixed-table-container .table thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.bootstrap-table .fixed-table-container .table tbody tr.selected td{background-color:rgba(0,0,0,.075)}.bootstrap-table .fixed-table-container .table tbody tr.no-records-found td{text-align:center}.bootstrap-table .fixed-table-container .table tbody tr .card-view{display:flex}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.bootstrap-table .fixed-table-container .table .bs-checkbox{text-align:center}.bootstrap-table .fixed-table-container .table .bs-checkbox label{margin-bottom:0}.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox],.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio]{margin:0 auto!important}.bootstrap-table .fixed-table-container .table.table-sm .th-inner{padding:.3rem}.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height.has-card-view{border-top:1px solid #dee2e6;border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .fixed-table-border{border-left:1px solid #dee2e6;border-right:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table thead th{border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table-dark thead th{border-bottom:1px solid #32383e}.bootstrap-table .fixed-table-container .fixed-table-header{overflow:hidden}.bootstrap-table .fixed-table-container .fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{align-items:center;background:#fff;display:none;justify-content:center;position:absolute;bottom:0;width:100%;z-index:1000}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap{align-items:baseline;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text{font-size:2rem;margin-right:6px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap{align-items:center;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{content:"";animation-duration:1.5s;animation-iteration-count:infinite;animation-name:LOADING;background:#212529;border-radius:50%;display:block;height:5px;margin:0 4px;opacity:0;width:5px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot{animation-delay:.3s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after{animation-delay:.6s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark{background:#212529}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before{background:#fff}.bootstrap-table .fixed-table-container .fixed-table-footer{overflow:hidden}.bootstrap-table .fixed-table-pagination::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-pagination>.pagination,.bootstrap-table .fixed-table-pagination>.pagination-detail{margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-pagination>.pagination-detail .pagination-info{line-height:34px;margin-right:5px}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list{display:inline-block}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group{position:relative;display:inline-block;vertical-align:middle}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group .dropdown-menu{margin-bottom:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination{margin:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination a{padding:6px 12px;line-height:1.428571429}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a{color:#c8c8c8}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::before{content:'\2B05'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::after{content:'\27A1'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.disabled a{pointer-events:none;cursor:default}.bootstrap-table.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#fff;height:calc(100vh);overflow-y:scroll}div.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}@keyframes LOADING{0%{opacity:0}50%{opacity:1}to{opacity:0}}
\ No newline at end of file
diff --git a/cps/static/css/listen.css b/cps/static/css/listen.css
index a69af72e..9e1d3bb4 100644
--- a/cps/static/css/listen.css
+++ b/cps/static/css/listen.css
@@ -66,19 +66,12 @@ body {
   right: 40px;
 }
 
-xmp,
-pre,
-plaintext {
-  display: block;
-  font-family: -moz-fixed;
-  white-space: pre;
-  margin: 1em 0;
-}
-
 pre {
+  display: block;
+  margin: 1em 0;
   white-space: pre-wrap;
   word-wrap: break-word;
-  font-family: -moz-fixed;
+  font-family: -moz-fixed, sans-serif;
   column-count: 2;
   -webkit-columns: 2;
   -moz-columns: 2;
diff --git a/cps/static/css/main.css b/cps/static/css/main.css
index 08506bc2..e97497de 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);
 }
 
@@ -36,7 +35,6 @@ body {
   height: 8%;
   min-height: 20px;
   padding: 10px;
-  /* margin: 0 50px 0 50px; */
   position: relative;
   color: #4f4f4f;
   font-weight: 100;
@@ -45,7 +43,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;
 }
 
@@ -74,12 +72,21 @@ body {
   padding: 3px;
 }
 
+#panels a {
+  visibility: hidden;
+  width: 18px;
+  height: 20px;
+  overflow: hidden;
+  display: inline-block;
+  color: #ccc;
+  margin-left: 6px;
+}
+
 #titlebar a:active {
   opacity: 1;
   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);
 }
 
@@ -116,12 +123,11 @@ body {
   top: 50%;
   margin-top: -192px;
   font-size: 64px;
-  color: #E2E2E2;
+  color: #e2e2e2;
   font-family: arial, sans-serif;
   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,16 +153,10 @@ 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;
 }
 
-#sidebar.open {
-  /* left: 0; */
-  /* -webkit-transform: translate(0, 0);
-  -moz-transform: translate(0, 0); */
-}
-
 #main.closed {
   /* left: 300px; */
   -webkit-transform: translate(300px, 0);
@@ -183,7 +183,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);
 }
 
@@ -200,19 +199,24 @@ body {
 
 #title-controls { float: right; }
 
-#panels a {
-  visibility: hidden;
-  width: 18px;
-  height: 20px;
-  overflow: hidden;
-  display: inline-block;
-  color: #ccc;
-  margin-left: 6px;
-}
-
 #panels a::before { visibility: visible; }
 #panels a:hover { color: #aaa; }
 
+.list_item.currentChapter > a,
+.list_item a:hover {
+  color: #f1f1f1;
+}
+
+.list_item a {
+  color: #aaa;
+  text-decoration: none;
+}
+
+#searchResults a {
+  color: #aaa;
+  text-decoration: none;
+}
+
 #panels a:active {
   color: #aaa;
   margin: 1px 0 -1px 6px;
@@ -232,7 +236,6 @@ body {
 
 input::-webkit-input-placeholder { color: #454545; }
 input:-moz-placeholder { color: #454545; }
-input:-ms-placeholder { color: #454545; }
 
 #divider {
   position: absolute;
@@ -243,7 +246,7 @@ input:-ms-placeholder { color: #454545; }
   left: 50%;
   margin-left: -1px;
   top: 10%;
-  opacity: .15;
+  opacity: 0.15;
   box-shadow: -2px 0 15px rgba(0, 0, 0, 1);
   display: none;
 }
@@ -268,24 +271,35 @@ 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 {
   display: block;
 }
 
+.list_item ul {
+  padding-left: 10px;
+  margin-top: 8px;
+  display: none;
+}
+
+.list_item.currentChapter > ul,
+.list_item.openChapter > ul {
+  display: block;
+}
+
 #tocView > ul,
 #bookmarksView > ul {
   margin-top: 15px;
@@ -296,22 +310,41 @@ input:-ms-placeholder { color: #454545; }
 
 #tocView li,
 #bookmarksView li {
-  margin-bottom:10px;
+  margin-bottom: 10px;
   width: 225px;
   font-family: Georgia, "Times New Roman", Times, serif;
   list-style: none;
   text-transform: capitalize;
 }
 
-#tocView li:active,
-#tocView li.currentChapter
-{
+.md-content > div ul li {
+  padding: 5px 0;
+}
+
+#settingsPanel li {
+  font-size: 1em;
+  color: #f1f1f1;
+}
+
+#searchResults li {
+  margin-bottom: 10px;
+  width: 225px;
+  font-family: Georgia, "Times New Roman", Times, serif;
   list-style: none;
 }
 
-.list_item a {
-  color: #aaa;
-  text-decoration: none;
+#notes li {
+  color: #eee;
+  font-size: 12px;
+  width: 240px;
+  border-top: 1px #fff solid;
+  padding-top: 6px;
+  margin-bottom: 6px;
+}
+
+#tocView li:active,
+#tocView li.currentChapter {
+  list-style: none;
 }
 
 .list_item a.chapter {
@@ -322,27 +355,11 @@ input:-ms-placeholder { color: #454545; }
   font-size: 0.8em;
 }
 
-.list_item.currentChapter > a,
-.list_item a:hover {
-  color: #f1f1f1
-}
-
 /* #tocView li.openChapter > a, */
 .list_item a:hover {
   color: #e2e2e2;
 }
 
-.list_item ul {
-  padding-left:10px;
-  margin-top: 8px;
-  display: none;
-}
-
-.list_item.currentChapter > ul,
-.list_item.openChapter > ul {
-  display: block;
-}
-
 #tocView.hidden {
   display: none;
 }
@@ -357,14 +374,14 @@ input:-ms-placeholder { color: #454545; }
   user-select: none;
 }
 
-.toc_toggle:before {
+.toc_toggle::before {
   content: '▸';
   color: #fff;
   margin-right: -4px;
 }
 
-.currentChapter > .toc_toggle:before,
-.openChapter > .toc_toggle:before {
+.currentChapter > .toc_toggle::before,
+.openChapter > .toc_toggle::before {
   content: '▾';
 }
 
@@ -382,18 +399,6 @@ input:-ms-placeholder { color: #454545; }
   display: block;
 }
 
-#searchResults li {
-  margin-bottom:10px;
-  width: 225px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  list-style: none;
-}
-
-#searchResults a {
-  color: #aaa;
-  text-decoration: none;
-}
-
 #searchResults p {
   text-decoration: none;
   font-size: 12px;
@@ -405,10 +410,21 @@ input:-ms-placeholder { color: #454545; }
   color: #000;
 }
 
+.md-content > div p {
+  margin: 0;
+  padding: 10px 0;
+}
+
 #searchResults li > p {
   color: #aaa;
 }
 
+#notes li a {
+  color: #fff;
+  display: inline-block;
+  margin-left: 6px;
+}
+
 #searchResults li a:hover {
   color: #e2e2e2;
 }
@@ -419,22 +435,7 @@ input:-ms-placeholder { color: #454545; }
 }
 
 #notes {
- padding: 0 0 0 34px;
-}
-
-#notes li {
-  color: #eee;
-  font-size: 12px;
-  width: 240px;
-  border-top: 1px #fff solid;
-  padding-top: 6px;
-  margin-bottom: 6px;
-}
-
-#notes li a {
-  color: #fff;
-  display: inline-block;
-  margin-left: 6px;
+  padding: 0 0 0 34px;
 }
 
 #notes li a:hover {
@@ -454,8 +455,9 @@ input:-ms-placeholder { color: #454545; }
   border-radius: 5px;
 }
 
-#note-text[disabled], #note-text[disabled="disabled"]{
-    opacity: 0.5;
+#note-text[disabled],
+#note-text[disabled="disabled"] {
+  opacity: 0.5;
 }
 
 #note-anchor {
@@ -467,6 +469,22 @@ input:-ms-placeholder { color: #454545; }
   display: none;
 }
 
+.md-content h3 {
+  margin: 0;
+  padding: 6px;
+  text-align: center;
+  font-size: 22px;
+  font-weight: 300;
+  opacity: 0.8;
+  background: rgba(0, 0, 0, 0.1);
+  border-radius: 3px 3px 0 0;
+}
+
+.md-content > div ul {
+  margin: 0;
+  padding: 0 0 30px 20px;
+}
+
 #settingsPanel h3 {
   color: #f1f1f1;
   font-family: Georgia, "Times New Roman", Times, serif;
@@ -478,32 +496,24 @@ input:-ms-placeholder { color: #454545; }
   list-style-type: none;
 }
 
-#settingsPanel li {
-  font-size: 1em;
-  color: #f1f1f1;
-}
+#settingsPanel .xsmall { font-size: x-small; }
+#settingsPanel .small { font-size: small; }
+#settingsPanel .medium { font-size: medium; }
+#settingsPanel .large { font-size: large; }
+#settingsPanel .xlarge { font-size: x-large; }
 
-#settingsPanel .xsmall {  font-size: x-small; }
-#settingsPanel .small {  font-size: small; }
-#settingsPanel .medium {  font-size: medium; }
-#settingsPanel .large {  font-size: large; }
-#settingsPanel .xlarge {  font-size: x-large; }
-
-.highlight { background-color: yellow }
+.highlight { background-color: yellow; }
 
 .modal {
   position: fixed;
   top: 50%;
   left: 50%;
-  width: 50%;
   width: 630px;
-
   height: auto;
   z-index: 2000;
   visibility: hidden;
   margin-left: -320px;
   margin-top: -160px;
-
 }
 
 .overlay {
@@ -518,17 +528,16 @@ 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;
 }
 
 .md-show {
-    visibility: visible;
+  visibility: visible;
 }
 
 .md-show ~ .overlay {
-    opacity: 1;
-    visibility: visible;
+  opacity: 1;
+  visibility: visible;
 }
 
 /* Content styles */
@@ -541,17 +550,6 @@ input:-ms-placeholder { color: #454545; }
   height: 320px;
 }
 
-.md-content h3 {
-  margin: 0;
-  padding: 6px;
-  text-align: center;
-  font-size: 22px;
-  font-weight: 300;
-  opacity: 0.8;
-  background: rgba(0, 0, 0, 0.1);
-  border-radius: 3px 3px 0 0;
-}
-
 .md-content > div {
   padding: 15px 40px 30px;
   margin: 0;
@@ -559,20 +557,6 @@ input:-ms-placeholder { color: #454545; }
   font-size: 14px;
 }
 
-.md-content > div p {
-  margin: 0;
-  padding: 10px 0;
-}
-
-.md-content > div ul {
-  margin: 0;
-  padding: 0 0 30px 20px;
-}
-
-.md-content > div ul li {
-  padding: 5px 0;
-}
-
 .md-content button {
   display: block;
   margin: 0 auto;
@@ -588,7 +572,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 +584,6 @@ input:-ms-placeholder { color: #454545; }
 }
 
 .md-content > .closer {
-  font-size: 18px;
   position: absolute;
   right: 0;
   top: 0;
@@ -610,7 +592,7 @@ input:-ms-placeholder { color: #454545; }
 }
 
 @media only screen and (max-width: 1040px) and (orientation: portrait) {
-  #viewer{
+  #viewer {
     width: 80%;
     margin-left: 10%;
   }
@@ -622,7 +604,7 @@ input:-ms-placeholder { color: #454545; }
 }
 
 @media only screen and (max-width: 900px) {
-  #viewer{
+  #viewer {
     width: 60%;
     margin-left: 20%;
   }
@@ -637,7 +619,7 @@ input:-ms-placeholder { color: #454545; }
 }
 
 @media only screen and (max-width: 550px) {
-  #viewer{
+  #viewer {
     width: 80%;
     margin-left: 10%;
   }
@@ -661,9 +643,9 @@ input:-ms-placeholder { color: #454545; }
     -webkit-transform: translate(0, 0);
     -moz-transform: translate(0, 0);
     -ms-transform: translate(0, 0);
-    -webkit-transition: -webkit-transform .3s;
-    -moz-transition: -moz-transform .3s;
-    -ms-transition: -moz-transform .3s;
+    -webkit-transition: -webkit-transform 0.3s;
+    -moz-transition: -moz-transform 0.3s;
+    transition: -moz-transform 0.3s;
   }
 
   #main.closed {
@@ -672,11 +654,6 @@ input:-ms-placeholder { color: #454545; }
     -ms-transform: translate(260px, 0);
   }
 
-  #titlebar {
-    /* font-size: 16px; */
-    /* margin: 0 50px 0 50px; */
-  }
-
   #metainfo {
     font-size: 10px;
   }
@@ -689,130 +666,129 @@ input:-ms-placeholder { color: #454545; }
     font-size: 12px;
   }
 
-  #tocView > ul{
+  #tocView > ul {
     padding-left: 10px;
   }
 }
 
-
 /* For iPad portrait layouts only */
 @media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: portrait) {
-    #viewer iframe {
-        width: 460px;
-        height: 740px;
-    }
+  #viewer iframe {
+    width: 460px;
+    height: 740px;
+  }
 }
- /*For iPad landscape layouts only *//*
-@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: landscape) {
-    #viewer iframe {
-        width: 460px;
-        height: 415px;
-    }
-}*/
 
 @media only screen
-and (min-device-width : 768px)
-and (max-device-width : 1024px)
-and (orientation : landscape)
-/*and (-webkit-min-device-pixel-ratio: 2)*/ {
-  #viewer{
+  and (min-device-width: 768px)
+  and (max-device-width: 1024px)
+  and (orientation: landscape)
+  /* and (-webkit-min-device-pixel-ratio: 2)*/ {
+  #viewer {
     width: 80%;
     margin-left: 10%;
   }
+
   #divider,
   #divider.show {
     display: none;
   }
 }
 
- /*For iPad landscape layouts only */
+/* For iPad landscape layouts only */
 @media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: landscape) {
-    #viewer iframe {
-        width: 960px;
-        height: 515px;
-    }
+  #viewer iframe {
+    width: 960px;
+    height: 515px;
+  }
 }
 
 /* For iPhone 6\6s portrait layouts only */
-@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation: portrait) {
-    #viewer {
-      width: 300px;
-      height: 480px;
-    }
-    #viewer iframe {
-       width: 300px;
-       height: 480px;
-    }
+@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: portrait) {
+  #viewer {
+    width: 300px;
+    height: 480px;
+  }
+
+  #viewer iframe {
+   width: 300px;
+   height: 480px;
+  }
 }
 
 /* For iPhone 6\6s landscape layouts only */
-@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation: landscape) {
-    #viewer {
-      width: 450px;
-      height: 300px;
-    }
-    #viewer iframe {
-       width: 450px;
-       height: 300px;
-    }
+@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: landscape) {
+  #viewer {
+    width: 450px;
+    height: 300px;
+  }
+
+  #viewer iframe {
+    width: 450px;
+    height: 300px;
+  }
 }
 
 /* For iPhone portrait layouts only */
 @media only screen and (max-device-width: 374px) and (orientation: portrait) {
-    #viewer {
-      width: 256px;
-      height: 432px;
-    }
-    #viewer iframe {
-       width: 256px;
-       height: 432px;
-    }
+  #viewer {
+    width: 256px;
+    height: 432px;
+  }
+
+  #viewer iframe {
+    width: 256px;
+    height: 432px;
+  }
 }
 
 /* For iPhone landscape layouts only */
 @media only screen and (max-device-width: 374px) and (orientation: landscape) {
-    #viewer iframe {
-        width: 256px;
-        height: 124px;
-    }
+  #viewer iframe {
+    width: 256px;
+    height: 124px;
+  }
 }
 
-[class^="icon-"]:before, [class*=" icon-"]:before {
-    font-family: "fontello";
-    font-style: normal;
-    font-weight: normal;
-    speak: none;
-    display: inline-block;
-    text-decoration: inherit;
-    width: 1em;
-    margin-right: 0.2em;
-    text-align: center;
-    /* For safety - reset parent styles, that can break glyph codes*/
-    font-variant: normal;
-    text-transform: none;
-    /* you can be more comfortable with increased icons size */
-    font-size: 112%;
+[class^="icon-"]::before,
+[class*=" icon-"]::before {
+  font-family: "fontello", serif;
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: 0.2em;
+  text-align: center;
+
+  /* For safety - reset parent styles, that can break glyph codes */
+  font-variant: normal;
+  text-transform: none;
+
+  /* you can be more comfortable with increased icons size */
+  font-size: 112%;
 }
 
-.icon-search:before { content: '\e807'; } /* '' */
-.icon-resize-full-1:before { content: '\e804'; } /* '' */
-.icon-cancel-circled2:before { content: '\e80f'; } /* '' */
-.icon-link:before { content: '\e80d'; } /* '' */
-.icon-bookmark:before { content: '\e805'; } /* '' */
-.icon-bookmark-empty:before { content: '\e806'; } /* '' */
-.icon-download-cloud:before { content: '\e811'; } /* '' */
-.icon-edit:before { content: '\e814'; } /* '' */
-.icon-menu:before { content: '\e802'; } /* '' */
-.icon-cog:before { content: '\e813'; } /* '' */
-.icon-resize-full:before { content: '\e812'; } /* '' */
-.icon-cancel-circled:before { content: '\e80e'; } /* '' */
-.icon-up-dir:before { content: '\e80c'; } /* '' */
-.icon-right-dir:before { content: '\e80b'; } /* '' */
-.icon-angle-right:before { content: '\e809'; } /* '' */
-.icon-angle-down:before { content: '\e80a'; } /* '' */
-.icon-right:before { content: '\e815'; } /* '' */
-.icon-list-1:before { content: '\e803'; } /* '' */
-.icon-list-numbered:before { content: '\e801'; } /* '' */
-.icon-columns:before { content: '\e810'; } /* '' */
-.icon-list:before { content: '\e800'; } /* '' */
-.icon-resize-small:before { content: '\e808'; } /* '' */
+.icon-search::before { content: '\e807'; } /* '' */
+.icon-resize-full-1::before { content: '\e804'; } /* '' */
+.icon-cancel-circled2::before { content: '\e80f'; } /* '' */
+.icon-link::before { content: '\e80d'; } /* '' */
+.icon-bookmark::before { content: '\e805'; } /* '' */
+.icon-bookmark-empty::before { content: '\e806'; } /* '' */
+.icon-download-cloud::before { content: '\e811'; } /* '' */
+.icon-edit::before { content: '\e814'; } /* '' */
+.icon-menu::before { content: '\e802'; } /* '' */
+.icon-cog::before { content: '\e813'; } /* '' */
+.icon-resize-full::before { content: '\e812'; } /* '' */
+.icon-cancel-circled::before { content: '\e80e'; } /* '' */
+.icon-up-dir::before { content: '\e80c'; } /* '' */
+.icon-right-dir::before { content: '\e80b'; } /* '' */
+.icon-angle-right::before { content: '\e809'; } /* '' */
+.icon-angle-down::before { content: '\e80a'; } /* '' */
+.icon-right::before { content: '\e815'; } /* '' */
+.icon-list-1::before { content: '\e803'; } /* '' */
+.icon-list-numbered::before { content: '\e801'; } /* '' */
+.icon-columns::before { content: '\e810'; } /* '' */
+.icon-list::before { content: '\e800'; } /* '' */
+.icon-resize-small::before { content: '\e808'; } /* '' */
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 4d8b4805..02658771 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -1,7 +1,7 @@
 
 .tooltip.bottom .tooltip-inner {
   font-size: 13px;
-  font-family: Open Sans Semibold,Helvetica Neue,Helvetica,Arial,sans-serif;
+  font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   padding: 3px 10px;
@@ -28,6 +28,11 @@ html.http-error {
   height: 100%;
 }
 
+body {
+  background: #f2f2f2;
+  margin-bottom: 40px;
+}
+
 .http-error body {
   margin: 0;
   height: 100%;
@@ -41,17 +46,39 @@ html.http-error {
   text-align: center;
 }
 
-body {
-  background: #f2f2f2;
-  margin-bottom: 40px;
-}
-
 body h2 {
   font-weight: normal;
-  color:#444;
+  color: #444;
 }
 
-a { color: #45b29d; }
+a,
+.danger,
+.book-remove,
+.editable-empty,
+.editable-empty:hover { color: #45b29d; }
+.user-remove:hover { color: #23527c; }
+.btn-default a { color: #444; }
+.panel-title > a { text-decoration: none; }
+
+.navigation li a {
+  color: #444;
+  text-decoration: none;
+  display: block;
+  padding: 10px;
+}
+
+.btn-default a:hover {
+  color: #45b29d;
+  text-decoration: None;
+}
+
+.btn-default:hover {
+  color: #45b29d;
+}
+
+.editable-click,
+a.editable-click,
+a.editable-click:hover { border-bottom: None; }
 
 .navigation .nav-head {
   text-transform: uppercase;
@@ -63,11 +90,18 @@ a { color: #45b29d; }
   border-top: 1px solid #ccc;
   padding-top: 20px;
 }
-.navigation li a {
-  color: #444;
+
+.book-meta .tags a { display: inline; }
+table .bg-primary a { color: #fff; }
+table .bg-dark-danger a { color: #fff; }
+.book-meta .identifiers a { display: inline; }
+
+.navigation .create-shelf a {
+  color: #fff;
+  background: #45b29d;
+  padding: 10px 20px;
+  border-radius: 5px;
   text-decoration: none;
-  display: block;
-  padding: 10px;
 }
 
 .navigation li a:hover {
@@ -83,42 +117,68 @@ a { color: #45b29d; }
   text-align: center;
 }
 
-.navigation .create-shelf a {
-  color: #fff;
-  background: #45b29d;
-  padding: 10px 20px;
-  border-radius: 5px;
-  text-decoration: none;
+.row.display-flex {
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .container-fluid img {
   display: block;
   max-width: 100%;
   height: auto;
+  max-height: 100%;
 }
 
-.container-fluid .discover{ margin-bottom: 50px; }
+.container-fluid .discover { margin-bottom: 50px; }
 .container-fluid .new-books { border-top: 1px solid #ccc; }
 .container-fluid .new-books h2 { margin: 50px 0 0 0; }
-.container-fluid .book { margin-top: 20px; }
+
+.container-fluid .book {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+}
+.cover { margin-bottom: 10px; }
 
 .container-fluid .book .cover {
   height: 225px;
   position: relative;
 }
 
-.container-fluid .book .cover img {
+.author-link img {
+  display: block;
+  height: 100%;
+}
+
+.container-fluid .book .cover span.img {
+  bottom: 0;
+  height: 100%;
+  position: absolute;
+}
+.author-bio img { margin: 0 1em 1em 0; }
+
+.container-fluid .single .cover img {
   border: 1px solid #fff;
   box-sizing: border-box;
+  -webkit-box-shadow: 0 5px 8px -6px #777;
+  -moz-box-shadow: 0 5px 8px -6px #777;
+  box-shadow: 0 5px 8px -6px #777;
+}
+
+.container-fluid .book .cover span img {
+  position: relative;
+  top: 0;
+  left: 0;
   height: 100%;
-  bottom: 0;
-  position: absolute;
+  border: 1px solid #fff;
+  box-sizing: border-box;
   -webkit-box-shadow: 0 5px 8px -6px #777;
   -moz-box-shadow: 0 5px 8px -6px #777;
   box-shadow: 0 5px 8px -6px #777;
 }
 
 .container-fluid .book .meta { margin-top: 10px; }
+.media-body p { text-align: justify; }
 .container-fluid .book .meta p { margin: 0; }
 
 .container-fluid .book .meta .title {
@@ -127,6 +187,12 @@ a { color: #45b29d; }
   color: #444;
 }
 
+.container-fluid .book .meta .series {
+  font-weight: 400;
+  font-size: 12px;
+  color: #444;
+}
+
 .container-fluid .book .meta .author {
   font-size: 12px;
   color: #999;
@@ -135,9 +201,10 @@ a { color: #45b29d; }
 .container-fluid .book .meta .rating { margin-top: 5px; }
 .rating .glyphicon-star-empty { color: #444; }
 .rating .glyphicon-star.good { color: #444; }
-.rating-clear .glyphicon-remove { color: #333  }
+.rating-clear .glyphicon-remove { color: #333; }
 
-.container-fluid .author .author-hidden, .container-fluid .author .author-hidden-divider { display: none; }
+.container-fluid .author .author-hidden,
+.container-fluid .author .author-hidden-divider { display: none; }
 
 .navbar-brand {
   font-family: 'Grand Hotel', cursive;
@@ -151,7 +218,7 @@ a { color: #45b29d; }
   border-top: 1px solid #ccc;
 }
 
-.more-stuff>li { margin-bottom: 10px; }
+.more-stuff > li { margin-bottom: 10px; }
 .navbar-collapse.in .navbar-nav { margin: 0; }
 
 span.glyphicon.glyphicon-tags {
@@ -161,34 +228,38 @@ span.glyphicon.glyphicon-tags {
 }
 
 .book-meta { padding-bottom: 20px; }
-.book-meta .tags a { display: inline; }
-.book-meta .identifiers a { display: inline; }
 
-.container-fluid .single .cover img {
-  border: 1px solid #fff;
-  box-sizing: border-box;
-  -webkit-box-shadow: 0 5px 8px -6px #777;
-  -moz-box-shadow: 0 5px 8px -6px #777;
-  box-shadow: 0 5px 8px -6px #777;
+.navbar-default .navbar-toggle .icon-bar { background-color: #000; }
+.navbar-default .navbar-toggle { border-color: #000; }
+
+.cover .badge {
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  color: #000;
+  border-radius: 10px;
+  background-color: #fff;
 }
 
-.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;
+.cover .read {
+  left: auto;
+  right: 2px;
+  width: 17px;
+  height: 17px;
+  display: inline-block;
+  padding: 2px;
 }
-.cover-height { max-height: 100px;}
+.cover-height { max-height: 100px; }
 
 .col-sm-2 a .cover-small {
   margin: 5px;
   max-height: 200px;
 }
 
-.btn-file {position: relative; overflow: hidden;}
+.btn-file {
+  position: relative;
+  overflow: hidden;
+}
 
 .btn-file input[type=file] {
   position: absolute;
@@ -206,24 +277,60 @@ span.glyphicon.glyphicon-tags {
   display: block;
 }
 
-.btn-toolbar .btn,.discover .btn { margin-bottom: 5px; }
-.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; }
-.panel-body {background-color: #f5f5f5; }
-.spinner {margin: 0 41%; }
-.spinner2 {margin: 0 41%; }
-.intend-form { margin-left:20px; }
-table .bg-dark-danger {background-color: #d9534f; color: #fff; }
-table .bg-dark-danger a {color: #fff; }
-table .bg-dark-danger:hover {background-color: #c9302c; }
-table .bg-primary:hover {background-color: #1C5484; }
-table .bg-primary a {color: #fff; }
-.block-label {display: block;}
-.fake-input {position: absolute; pointer-events: none; top: 0; }
+.btn-toolbar .btn,
+.discover .btn { margin-bottom: 5px; }
+.button-link { color: #fff; }
 
-input.pill { position: absolute; opacity: 0; }
+.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: 0; }
+
+.panel-body { background-color: #f5f5f5; }
+.spinner { margin: 0 41%; }
+.spinner2 { margin: 0 41%; }
+.intend-form { margin-left: 20px; }
+
+table .bg-dark-danger {
+  background-color: #d9534f;
+  color: #fff;
+}
+table .bg-dark-danger:hover { background-color: #c9302c; }
+table .bg-primary:hover { background-color: #1c5484; }
+.block-label { display: block; }
+
+.fake-input {
+  position: absolute;
+  pointer-events: none;
+  top: 0;
+}
+
+input.pill {
+  position: absolute;
+  opacity: 0;
+}
 
 input.pill + label {
   border: 2px solid #45b29d;
@@ -245,12 +352,18 @@ input.pill:checked + label {
 
 input.pill:not(:checked) + label .glyphicon { display: none; }
 
-.author-bio img { margin: 0 1em 1em 0; }
-.author-link { display: inline-block; margin-top: 10px; width: 100px; }
-.author-link img { display: block; height: 100%; }
-#remove-from-shelves .btn, #shelf-action-errors { margin-left: 5px; }
+.author-link {
+  display: inline-block;
+  margin-top: 10px;
+  width: 100px;
+}
 
-.tags_click, .serie_click, .language_click { margin-right: 5px; }
+#remove-from-shelves .btn,
+#shelf-action-errors { margin-left: 5px; }
+
+.tags_click,
+.serie_click,
+.language_click { margin-right: 5px; }
 
 #meta-info {
   height: 600px;
@@ -258,7 +371,6 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
 }
 
 .media-list { padding-right: 15px; }
-.media-body p { text-align: justify; }
 
 #meta-info img {
   max-height: 150px;
@@ -271,22 +383,23 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
 #btn-upload-format { display: none; }
 .upload-cover-input-text { display: initial; }
 #btn-upload-cover { display: none; }
-.panel-title > a { text-decoration: none; }
+
 .editable-buttons {
-  display:inline-block;
+  display: inline-block;
   margin-left: 7px;
 }
 
-.editable-input { display:inline-block; }
+.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; }
 
 .modal-body .comments {
   max-height: 300px;
@@ -294,7 +407,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;
@@ -303,4 +416,3 @@ div.log {
   white-space: nowrap;
   padding: 0.5em;
 }
-
diff --git a/cps/static/generic_cover.jpg b/cps/static/generic_cover.jpg
index f5c090c1..67f98248 100644
Binary files a/cps/static/generic_cover.jpg and b/cps/static/generic_cover.jpg differ
diff --git a/cps/static/js/archive/unrar5.js b/cps/static/js/archive/unrar5.js
new file mode 100644
index 00000000..452989c0
--- /dev/null
+++ b/cps/static/js/archive/unrar5.js
@@ -0,0 +1,1371 @@
+/**
+ * unrar.js
+ *
+ * Licensed under the MIT License
+ *
+ * Copyright(c) 2011 Google Inc.
+ * Copyright(c) 2011 antimatter15
+ *
+ * Reference Documentation:
+ *
+ * http://kthoom.googlecode.com/hg/docs/unrar.html
+ */
+/* global bitjs, importScripts, RarVM, Uint8Array, UnpackFilter */
+/* 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/bytebuffer.js");
+importScripts("archive.js");
+importScripts("rarvm.js");*/
+
+// Progress variables.
+var currentFilename = "";
+var currentFileNumber = 0;
+var currentBytesUnarchivedInFile = 0;
+var currentBytesUnarchived = 0;
+var totalUncompressedBytesInArchive = 0;
+var totalFilesInArchive = 0;
+
+// Helper functions.
+var info = function(str) {
+    console.log(str)
+    //postMessage(new bitjs.archive.UnarchiveInfoEvent(str));
+};
+var err = function(str) {
+    console.log(str)
+    //postMessage(new bitjs.archive.UnarchiveErrorEvent(str));
+};
+var postProgress = function() {
+    /*postMessage(new bitjs.archive.UnarchiveProgressEvent(
+        currentFilename,
+        currentFileNumber,
+        currentBytesUnarchivedInFile,
+        currentBytesUnarchived,
+        totalUncompressedBytesInArchive,
+        totalFilesInArchive));*/
+};
+
+// shows a byte value as its hex representation
+var nibble = "0123456789ABCDEF";
+var byteValueToHexString = function(num) {
+    return nibble[num >> 4] + nibble[num & 0xF];
+};
+var twoByteValueToHexString = function(num) {
+    return nibble[(num >> 12) & 0xF] + nibble[(num >> 8) & 0xF] + nibble[(num >> 4) & 0xF] + nibble[num & 0xF];
+};
+
+
+// Volume Types
+var MAIN_HEAD         = 0x01,
+    ENCRYPT_HEAD      = 0x04,
+    FILE_HEAD         = 0x02,
+    SERVICE_HEAD      = 0x03,
+    // COMM_HEAD      = 0x75,
+    // AV_HEAD        = 0x76,
+    // SUB_HEAD       = 0x77,
+    // PROTECT_HEAD   = 0x78,
+    // SIGN_HEAD      = 0x79,
+    // NEWSUB_HEAD    = 0x7a,
+    ENDARC_HEAD = 0x05;
+
+// ============================================================================================== //
+
+var RarMainVolumeHeader = function(bstream) {
+    var headPos = bstream.bytePtr;
+    // byte 1,2
+    info("Rar Volume Header @" + bstream.bytePtr);
+
+    this.crc = bstream.readBits(16);
+    info("  crc=" + this.crc);
+
+    // byte 3
+    this.headType = bstream.readBits(8);
+    info("  headType=" + this.headType);
+
+    // Get flags
+    // bytes 4,5
+    this.flags = {};
+    this.flags.value = bstream.readBits(16);
+
+    // byte 6
+    this.headSize = bstream.readBits(8);
+    // byte 7
+    if (bstream.readBits(8) === 1) {
+        info("  RarVersion=5");
+    }
+    // byte 8
+    bstream.readBits(8);
+}
+
+var vint = function(bstream) {
+    var size = 0;
+    var result = 0;
+    var loop = 0 ;
+    do {
+        size = bstream.readBits(8);
+        result |= (size & 0x7F) << (loop * 7);
+        loop++;
+    } while (size & 0x80 )
+    return result;
+}
+
+/**
+ * @param {bitjs.io.BitStream} bstream
+ * @constructor
+ */
+var RarVolumeHeader = function(bstream) {
+    var headPos = bstream.bytePtr;
+    // byte 1,2
+    info("Rar Volume Header @" + bstream.bytePtr);
+
+    this.crc = bstream.readBits(32);
+    info("  crc=" + this.crc);
+
+    // byte 3 + x Header size
+    this.headSize = vint(bstream);
+    info("  Header Size=" + this.headSize);
+
+    // byte 4
+    this.headType = bstream.readBits(8);
+    info("  headType=" + this.headType);
+
+    // Get Header flags
+    this.headFlags = {};
+    this.headFlags.value = bstream.peekBits(8);
+
+    info("  Header flags=" + byteValueToHexString(this.headFlags.value));
+    this.headFlags.EXTRA_AREA = !!bstream.readBits(1);
+    this.headFlags.DATA_AREA = !!bstream.readBits(1);
+    this.headFlags.UNKNOWN = !!bstream.readBits(1);
+    this.headFlags.CONTINUE_FROM = !!bstream.readBits(1);
+    this.headFlags.CONTNUE_TO = !!bstream.readBits(1);
+    this.headFlags.DEPENDS = !!bstream.readBits(1);
+    this.headFlags.CHILDBLOCK = !!bstream.readBits(1);
+    bstream.readBits(1); // unused*/
+
+    // Get extra AreaSize
+    if (this.headFlags.EXTRA_AREA) {
+        this.extraSize = vint(bstream);
+    } else {
+        this.extraSize = 0;
+    }
+    if (this.headFlags.DATA_AREA && (this.headType == FILE_HEAD || this.headType == SERVICE_HEAD)) {
+        this.packSize = vint(bstream);
+        // this.packSize = bstream.readBits(32);
+    }
+    this.flags = {};
+    this.flags.value = bstream.peekBits(8);
+
+    switch (this.headType) {
+        case MAIN_HEAD:
+            // this.flags = {};
+            // this.flags.value = bstream.peekBits(16);
+            this.flags.MHD_VOLUME = !!bstream.readBits(1);
+            this.flags.MHD_VOLUMNE_NO = !!bstream.readBits(1);
+            this.flags.MHD_SOLID = !!bstream.readBits(1);
+            this.flags.MHD_RECOVERY = !!bstream.readBits(1);
+            this.flags.MHD_LOCKED = !!bstream.readBits(1);
+            bstream.readBits(3); // unused*/
+            if (this.flags.MHD_VOLUMNE_NO) {
+                this.volumeNumber = vint(bstream);
+            }
+            bstream.readBytes(this.extraSize);
+            // break;
+            return;     // Main Header finally parsed
+     // ------------
+        case FILE_HEAD:
+        case SERVICE_HEAD:
+            this.flags.DIRECTORY      = !!bstream.readBits(1);
+            this.flags.TIME           = !!bstream.readBits(1);
+            this.flags.CRC            = !!bstream.readBits(1);
+            this.flags.UNPACK_UNKNOWN = !!bstream.readBits(1);
+            bstream.readBits(4);
+
+            if (this.flags.UNPACK_UNKNOWN) {
+                vint(bstream);
+            } else {
+                this.unpackedSize = vint(bstream);
+            }
+            this.fileAttr = vint(bstream);
+            if (this.flags.TIME) {
+                this.fileTime = bstream.readBits(32);
+            }
+            if (this.flags.CRC) {
+                this.fileCRC = bstream.readBits(32);
+            }
+            // var compInfo = vint(bstream);
+            this.unpVer = bstream.readBits(6);
+            this.solid = bstream.readBits(1);
+            bstream.readBits(1);
+            this.method = bstream.readBits(3);
+            this.dictSize = bstream.readBits(4);
+            bstream.readBits(1);
+            this.hostOS = vint(bstream);
+            this.nameSize = vint(bstream);
+
+            this.filename = bstream.readBytes(this.nameSize);
+            var _s = "";
+            for (var _i = 0; _i < this.filename.length ; _i++) {
+                _s += String.fromCharCode(this.filename[_i]);
+            }
+
+            this.filename = _s;
+            bstream.readBytes(this.extraSize);
+            break;
+
+        default:
+            info("Found a header of type 0x" + byteValueToHexString(this.headType));
+            // skip the rest of the header bytes (for now)
+            bstream.readBytes(this.headSize - 7);
+            break;
+    }
+};
+
+//var BLOCK_LZ  = 0;
+
+var rLDecode = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224],
+    rLBits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5],
+    rDBitLengthCounts = [4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 14, 0, 12],
+    rSDDecode = [0, 4, 8, 16, 32, 64, 128, 192],
+    rSDBits = [2, 2, 3, 4, 5, 6, 6, 6];
+
+var rDDecode = [0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32,
+    48, 64, 96, 128, 192, 256, 384, 512, 768, 1024, 1536, 2048, 3072,
+    4096, 6144, 8192, 12288, 16384, 24576, 32768, 49152, 65536, 98304,
+    131072, 196608, 262144, 327680, 393216, 458752, 524288, 589824,
+    655360, 720896, 786432, 851968, 917504, 983040
+];
+
+var rDBits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
+    5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14,
+    15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
+];
+
+var rLowDistRepCount = 16;
+
+var rNC = 299,
+    rDC = 60,
+    rLDC = 17,
+    rRC = 28,
+    rBC = 20,
+    rHuffTableSize = (rNC + rDC + rRC + rLDC);
+
+//var UnpBlockType = BLOCK_LZ;
+var UnpOldTable = new Array(rHuffTableSize);
+
+var BD = { //bitdecode
+    DecodeLen: new Array(16),
+    DecodePos: new Array(16),
+    DecodeNum: new Array(rBC)
+};
+var LD = { //litdecode
+    DecodeLen: new Array(16),
+    DecodePos: new Array(16),
+    DecodeNum: new Array(rNC)
+};
+var DD = { //distdecode
+    DecodeLen: new Array(16),
+    DecodePos: new Array(16),
+    DecodeNum: new Array(rDC)
+};
+var LDD = { //low dist decode
+    DecodeLen: new Array(16),
+    DecodePos: new Array(16),
+    DecodeNum: new Array(rLDC)
+};
+var RD = { //rep decode
+    DecodeLen: new Array(16),
+    DecodePos: new Array(16),
+    DecodeNum: new Array(rRC)
+};
+
+/**
+ * @type {Array<bitjs.io.ByteBuffer>}
+ */
+var rOldBuffers = [];
+
+/**
+ * The current buffer we are unpacking to.
+ * @type {bitjs.io.ByteBuffer}
+ */
+var rBuffer;
+
+/**
+ * The buffer of the final bytes after filtering (only used in Unpack29).
+ * @type {bitjs.io.ByteBuffer}
+ */
+var wBuffer;
+
+var lowDistRepCount = 0;
+var prevLowDist = 0;
+
+var rOldDist = [0, 0, 0, 0];
+var lastDist;
+var lastLength;
+
+/**
+ * In unpack.cpp, UnpPtr keeps track of what bytes have been unpacked
+ * into the Window buffer and WrPtr keeps track of what bytes have been
+ * actually written to disk after the unpacking and optional filtering
+ * has been done.
+ *
+ * In our case, rBuffer is the buffer for the unpacked bytes and wBuffer is
+ * the final output bytes.
+ */
+
+
+/**
+ * Read in Huffman tables for RAR
+ * @param {bitjs.io.BitStream} bstream
+ */
+function rarReadTables(bstream) {
+    var BitLength = new Array(rBC);
+    var Table = new Array(rHuffTableSize);
+    var i;
+    // before we start anything we need to get byte-aligned
+    bstream.readBits((8 - bstream.bitPtr) & 0x7);
+
+    if (bstream.readBits(1)) {
+        info("Error!  PPM not implemented yet");
+        return;
+    }
+
+    if (!bstream.readBits(1)) { //discard old table
+        for (i = UnpOldTable.length; i--;) {
+            UnpOldTable[i] = 0;
+        }
+    }
+
+    // read in bit lengths
+    for (var I = 0; I < rBC; ++I) {
+        var Length = bstream.readBits(4);
+        if (Length === 15) {
+            var ZeroCount = bstream.readBits(4);
+            if (ZeroCount === 0) {
+                BitLength[I] = 15;
+            } else {
+                ZeroCount += 2;
+                while (ZeroCount-- > 0 && I < rBC) {
+                    BitLength[I++] = 0;
+                }
+                --I;
+            }
+        } else {
+            BitLength[I] = Length;
+        }
+    }
+
+    // now all 20 bit lengths are obtained, we construct the Huffman Table:
+
+    rarMakeDecodeTables(BitLength, 0, BD, rBC);
+
+    var TableSize = rHuffTableSize;
+    //console.log(DecodeLen, DecodePos, DecodeNum);
+    for (i = 0; i < TableSize;) {
+        var N;
+        var num = rarDecodeNumber(bstream, BD);
+        if (num < 16) {
+            Table[i] = (num + UnpOldTable[i]) & 0xf;
+            i++;
+        } else if (num < 18) {
+            N = (num === 16) ? (bstream.readBits(3) + 3) : (bstream.readBits(7) + 11);
+
+            while (N-- > 0 && i < TableSize) {
+                Table[i] = Table[i - 1];
+                i++;
+            }
+        } else {
+            N = (num === 18) ? (bstream.readBits(3) + 3) : (bstream.readBits(7) + 11);
+
+            while (N-- > 0 && i < TableSize) {
+                Table[i++] = 0;
+            }
+        }
+    }
+
+    rarMakeDecodeTables(Table, 0, LD, rNC);
+    rarMakeDecodeTables(Table, rNC, DD, rDC);
+    rarMakeDecodeTables(Table, rNC + rDC, LDD, rLDC);
+    rarMakeDecodeTables(Table, rNC + rDC + rLDC, RD, rRC);
+
+    for (i = UnpOldTable.length; i--;) {
+        UnpOldTable[i] = Table[i];
+    }
+    return true;
+}
+
+
+function rarDecodeNumber(bstream, dec) {
+    var DecodeLen = dec.DecodeLen,
+        DecodePos = dec.DecodePos,
+        DecodeNum = dec.DecodeNum;
+    var bitField = bstream.getBits() & 0xfffe;
+    //some sort of rolled out binary search
+    var bits = ((bitField < DecodeLen[8]) ?
+        ((bitField < DecodeLen[4]) ?
+            ((bitField < DecodeLen[2]) ?
+                ((bitField < DecodeLen[1]) ? 1 : 2) :
+                ((bitField < DecodeLen[3]) ? 3 : 4)) :
+            (bitField < DecodeLen[6]) ?
+                ((bitField < DecodeLen[5]) ? 5 : 6) :
+                ((bitField < DecodeLen[7]) ? 7 : 8)) :
+        ((bitField < DecodeLen[12]) ?
+            ((bitField < DecodeLen[10]) ?
+                ((bitField < DecodeLen[9]) ? 9 : 10) :
+                ((bitField < DecodeLen[11]) ? 11 : 12)) :
+            (bitField < DecodeLen[14]) ?
+                ((bitField < DecodeLen[13]) ? 13 : 14) :
+                15));
+    bstream.readBits(bits);
+    var N = DecodePos[bits] + ((bitField - DecodeLen[bits - 1]) >>> (16 - bits));
+
+    return DecodeNum[N];
+}
+
+
+function rarMakeDecodeTables(BitLength, offset, dec, size) {
+    var DecodeLen = dec.DecodeLen;
+    var DecodePos = dec.DecodePos;
+    var DecodeNum = dec.DecodeNum;
+    var LenCount = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+    var TmpPos = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+    var N = 0;
+    var M = 0;
+    var i;
+    for (i = DecodeNum.length; i--;) {
+        DecodeNum[i] = 0;
+    }
+    for (i = 0; i < size; i++) {
+        LenCount[BitLength[i + offset] & 0xF]++;
+    }
+    LenCount[0] = 0;
+    TmpPos[0] = 0;
+    DecodePos[0] = 0;
+    DecodeLen[0] = 0;
+
+    var I;
+    for (I = 1; I < 16; ++I) {
+        N = 2 * (N + LenCount[I]);
+        M = (N << (15 - I));
+        if (M > 0xFFFF) {
+            M = 0xFFFF;
+        }
+        DecodeLen[I] = M;
+        DecodePos[I] = DecodePos[I - 1] + LenCount[I - 1];
+        TmpPos[I] = DecodePos[I];
+    }
+    for (I = 0; I < size; ++I) {
+        if (BitLength[I + offset] !== 0) {
+            DecodeNum[TmpPos[BitLength[offset + I] & 0xF]++] = I;
+        }
+    }
+
+}
+
+// TODO: implement
+/**
+ * @param {bitjs.io.BitStream} bstream
+ * @param {boolean} Solid
+ */
+function unpack15() { //bstream, Solid) {
+    info("ERROR!  RAR 1.5 compression not supported");
+}
+
+/**
+ * Unpacks the bit stream into rBuffer using the Unpack20 algorithm.
+ * @param {bitjs.io.BitStream} bstream
+ * @param {boolean} Solid
+ */
+function unpack20(bstream) { //, Solid) {
+    var destUnpSize = rBuffer.data.length;
+    var oldDistPtr = 0;
+    var Length;
+    var Distance;
+    rarReadTables20(bstream);
+    while (destUnpSize > rBuffer.ptr) {
+        var num = rarDecodeNumber(bstream, LD);
+        var Bits;
+        if (num < 256) {
+            rBuffer.insertByte(num);
+            continue;
+        }
+        if (num > 269) {
+            Length = rLDecode[num -= 270] + 3;
+            if ((Bits = rLBits[num]) > 0) {
+                Length += bstream.readBits(Bits);
+            }
+            var DistNumber = rarDecodeNumber(bstream, DD);
+            Distance = rDDecode[DistNumber] + 1;
+            if ((Bits = rDBits[DistNumber]) > 0) {
+                Distance += bstream.readBits(Bits);
+            }
+            if (Distance >= 0x2000) {
+                Length++;
+                if (Distance >= 0x40000) {
+                    Length++;
+                }
+            }
+            lastLength = Length;
+            lastDist = rOldDist[oldDistPtr++ & 3] = Distance;
+            rarCopyString(Length, Distance);
+            continue;
+        }
+        if (num === 269) {
+            rarReadTables20(bstream);
+            rarUpdateProgress();
+            continue;
+        }
+        if (num === 256) {
+            lastDist = rOldDist[oldDistPtr++ & 3] = lastDist;
+            rarCopyString(lastLength, lastDist);
+            continue;
+        }
+        if (num < 261) {
+            Distance = rOldDist[(oldDistPtr - (num - 256)) & 3];
+            var LengthNumber = rarDecodeNumber(bstream, RD);
+            Length = rLDecode[LengthNumber] + 2;
+            if ((Bits = rLBits[LengthNumber]) > 0) {
+                Length += bstream.readBits(Bits);
+            }
+            if (Distance >= 0x101) {
+                Length++;
+                if (Distance >= 0x2000) {
+                    Length++;
+                    if (Distance >= 0x40000) {
+                        Length++;
+                    }
+                }
+            }
+            lastLength = Length;
+            lastDist = rOldDist[oldDistPtr++ & 3] = Distance;
+            rarCopyString(Length, Distance);
+            continue;
+        }
+        if (num < 270) {
+            Distance = rSDDecode[num -= 261] + 1;
+            if ((Bits = rSDBits[num]) > 0) {
+                Distance += bstream.readBits(Bits);
+            }
+            lastLength = 2;
+            lastDist = rOldDist[oldDistPtr++ & 3] = Distance;
+            rarCopyString(2, Distance);
+            continue;
+        }
+    }
+    rarUpdateProgress();
+}
+
+function rarUpdateProgress() {
+    var change = rBuffer.ptr - currentBytesUnarchivedInFile;
+    currentBytesUnarchivedInFile = rBuffer.ptr;
+    currentBytesUnarchived += change;
+    postProgress();
+}
+
+var rNC20 = 298,
+    rDC20 = 48,
+    rRC20 = 28,
+    rBC20 = 19,
+    rMC20 = 257;
+
+var UnpOldTable20 = new Array(rMC20 * 4);
+
+function rarReadTables20(bstream) {
+    var BitLength = new Array(rBC20);
+    var Table = new Array(rMC20 * 4);
+    var TableSize, N, I;
+    var i;
+    bstream.readBits(1);
+    if (!bstream.readBits(1)) {
+        for (i = UnpOldTable20.length; i--;) {
+            UnpOldTable20[i] = 0;
+        }
+    }
+    TableSize = rNC20 + rDC20 + rRC20;
+    for (I = 0; I < rBC20; I++) {
+        BitLength[I] = bstream.readBits(4);
+    }
+    rarMakeDecodeTables(BitLength, 0, BD, rBC20);
+    I = 0;
+    while (I < TableSize) {
+        var num = rarDecodeNumber(bstream, BD);
+        if (num < 16) {
+            Table[I] = num + UnpOldTable20[I] & 0xf;
+            I++;
+        } else if (num === 16) {
+            N = bstream.readBits(2) + 3;
+            while (N-- > 0 && I < TableSize) {
+                Table[I] = Table[I - 1];
+                I++;
+            }
+        } else {
+            if (num === 17) {
+                N = bstream.readBits(3) + 3;
+            } else {
+                N = bstream.readBits(7) + 11;
+            }
+            while (N-- > 0 && I < TableSize) {
+                Table[I++] = 0;
+            }
+        }
+    }
+    rarMakeDecodeTables(Table, 0, LD, rNC20);
+    rarMakeDecodeTables(Table, rNC20, DD, rDC20);
+    rarMakeDecodeTables(Table, rNC20 + rDC20, RD, rRC20);
+    for (i = UnpOldTable20.length; i--;) {
+        UnpOldTable20[i] = Table[i];
+    }
+}
+
+// ============================================================================================== //
+
+// Unpack code specific to RarVM
+var VM = new RarVM();
+
+/**
+ * Filters code, one entry per filter.
+ * @type {Array<UnpackFilter>}
+ */
+var Filters = [];
+
+/**
+ * Filters stack, several entrances of same filter are possible.
+ * @type {Array<UnpackFilter>}
+ */
+var PrgStack = [];
+
+/**
+ * Lengths of preceding blocks, one length per filter. Used to reduce
+ * size required to write block length if lengths are repeating.
+ * @type {Array<number>}
+ */
+var OldFilterLengths = [];
+
+var LastFilter = 0;
+
+function initFilters() {
+    OldFilterLengths = [];
+    LastFilter = 0;
+    Filters = [];
+    PrgStack = [];
+}
+
+
+/**
+ * @param {number} firstByte The first byte (flags).
+ * @param {Uint8Array} vmCode An array of bytes.
+ */
+function rarAddVMCode(firstByte, vmCode) {
+    VM.init();
+    var i;
+    var bstream = new bitjs.io.BitStream(vmCode.buffer, true /* rtl */ );
+
+    var filtPos;
+    if (firstByte & 0x80) {
+        filtPos = RarVM.readData(bstream);
+        if (filtPos === 0) {
+            initFilters();
+        } else {
+            filtPos--;
+        }
+    } else {
+        filtPos = LastFilter;
+    }
+
+    if (filtPos > Filters.length || filtPos > OldFilterLengths.length) {
+        return false;
+    }
+
+    LastFilter = filtPos;
+    var newFilter = (filtPos === Filters.length);
+
+    // new filter for PrgStack
+    var stackFilter = new UnpackFilter();
+    var filter = null;
+    // new filter code, never used before since VM reset
+    if (newFilter) {
+        // too many different filters, corrupt archive
+        if (filtPos > 1024) {
+            return false;
+        }
+
+        filter = new UnpackFilter();
+        Filters.push(filter);
+        stackFilter.ParentFilter = (Filters.length - 1);
+        OldFilterLengths.push(0); // OldFilterLengths.Add(1)
+        filter.ExecCount = 0;
+    } else { // filter was used in the past
+        filter = Filters[filtPos];
+        stackFilter.ParentFilter = filtPos;
+        filter.ExecCount++;
+    }
+
+    var emptyCount = 0;
+    for (i = 0; i < PrgStack.length; ++i) {
+        PrgStack[i - emptyCount] = PrgStack[i];
+
+        if (PrgStack[i] === null) {
+            emptyCount++;
+        }
+        if (emptyCount > 0) {
+            PrgStack[i] = null;
+        }
+    }
+
+    if (emptyCount === 0) {
+        PrgStack.push(null); //PrgStack.Add(1);
+        emptyCount = 1;
+    }
+
+    var stackPos = PrgStack.length - emptyCount;
+    PrgStack[stackPos] = stackFilter;
+    stackFilter.ExecCount = filter.ExecCount;
+
+    var blockStart = RarVM.readData(bstream);
+    if (firstByte & 0x40) {
+        blockStart += 258;
+    }
+    stackFilter.BlockStart = (blockStart + rBuffer.ptr) & MAXWINMASK;
+
+    if (firstByte & 0x20) {
+        stackFilter.BlockLength = RarVM.readData(bstream);
+    } else {
+        stackFilter.BlockLength = filtPos < OldFilterLengths.length ?
+            OldFilterLengths[filtPos] :
+            0;
+    }
+    stackFilter.NextWindow = (wBuffer.ptr !== rBuffer.ptr) &&
+        (((wBuffer.ptr - rBuffer.ptr) & MAXWINMASK) <= blockStart);
+
+    OldFilterLengths[filtPos] = stackFilter.BlockLength;
+
+    for (i = 0; i < 7; ++i) {
+        stackFilter.Prg.InitR[i] = 0;
+    }
+    stackFilter.Prg.InitR[3] = VM_GLOBALMEMADDR;
+    stackFilter.Prg.InitR[4] = stackFilter.BlockLength;
+    stackFilter.Prg.InitR[5] = stackFilter.ExecCount;
+
+    // set registers to optional parameters if any
+    if (firstByte & 0x10) {
+        var initMask = bstream.readBits(7);
+        for (i = 0; i < 7; ++i) {
+            if (initMask & (1 << i)) {
+                stackFilter.Prg.InitR[i] = RarVM.readData(bstream);
+            }
+        }
+    }
+
+    if (newFilter) {
+        var vmCodeSize = RarVM.readData(bstream);
+        if (vmCodeSize >= 0x10000 || vmCodeSize === 0) {
+            return false;
+        }
+        vmCode = new Uint8Array(vmCodeSize);
+        for (i = 0; i < vmCodeSize; ++i) {
+            //if (Inp.Overflow(3))
+            //  return(false);
+            vmCode[i] = bstream.readBits(8);
+        }
+        VM.prepare(vmCode, filter.Prg);
+    }
+    stackFilter.Prg.Cmd = filter.Prg.Cmd;
+    stackFilter.Prg.AltCmd = filter.Prg.Cmd;
+
+    var staticDataSize = filter.Prg.StaticData.length;
+    if (staticDataSize > 0 && staticDataSize < VM_GLOBALMEMSIZE) {
+        // read statically defined data contained in DB commands
+        for (i = 0; i < staticDataSize; ++i) {
+            stackFilter.Prg.StaticData[i] = filter.Prg.StaticData[i];
+        }
+    }
+
+    if (stackFilter.Prg.GlobalData.length < VM_FIXEDGLOBALSIZE) {
+        stackFilter.Prg.GlobalData = new Uint8Array(VM_FIXEDGLOBALSIZE);
+    }
+
+    var globalData = stackFilter.Prg.GlobalData;
+    for (i = 0; i < 7; ++i) {
+        VM.setLowEndianValue(globalData, stackFilter.Prg.InitR[i], i * 4);
+    }
+
+    VM.setLowEndianValue(globalData, stackFilter.BlockLength, 0x1c);
+    VM.setLowEndianValue(globalData, 0, 0x20);
+    VM.setLowEndianValue(globalData, stackFilter.ExecCount, 0x2c);
+    for (i = 0; i < 16; ++i) {
+        globalData[0x30 + i] = 0;
+    }
+
+    // put data block passed as parameter if any
+    if (firstByte & 8) {
+        //if (Inp.Overflow(3))
+        //  return(false);
+        var dataSize = RarVM.readData(bstream);
+        if (dataSize > (VM_GLOBALMEMSIZE - VM_FIXEDGLOBALSIZE)) {
+            return (false);
+        }
+
+        var curSize = stackFilter.Prg.GlobalData.length;
+        if (curSize < dataSize + VM_FIXEDGLOBALSIZE) {
+            // Resize global data and update the stackFilter and local variable.
+            var numBytesToAdd = dataSize + VM_FIXEDGLOBALSIZE - curSize;
+            var newGlobalData = new Uint8Array(globalData.length + numBytesToAdd);
+            newGlobalData.set(globalData);
+
+            stackFilter.Prg.GlobalData = newGlobalData;
+            globalData = newGlobalData;
+        }
+        //byte *GlobalData=&StackFilter->Prg.GlobalData[VM_FIXEDGLOBALSIZE];
+        for (i = 0; i < dataSize; ++i) {
+            //if (Inp.Overflow(3))
+            //  return(false);
+            globalData[VM_FIXEDGLOBALSIZE + i] = bstream.readBits(8);
+        }
+    }
+
+    return true;
+}
+
+
+/**
+ * @param {!bitjs.io.BitStream} bstream
+ */
+function rarReadVMCode(bstream) {
+    var firstByte = bstream.readBits(8);
+    var length = (firstByte & 7) + 1;
+    if (length === 7) {
+        length = bstream.readBits(8) + 7;
+    } else if (length === 8) {
+        length = bstream.readBits(16);
+    }
+
+    // Read all bytes of VM code into an array.
+    var vmCode = new Uint8Array(length);
+    for (var i = 0; i < length; i++) {
+        // Do something here with checking readbuf.
+        vmCode[i] = bstream.readBits(8);
+    }
+    return rarAddVMCode(firstByte, vmCode);
+}
+
+/**
+ * Unpacks the bit stream into rBuffer using the Unpack29 algorithm.
+ * @param {bitjs.io.BitStream} bstream
+ * @param {boolean} Solid
+ */
+function unpack29(bstream) {
+    // lazy initialize rDDecode and rDBits
+
+    var DDecode = new Array(rDC);
+    var DBits = new Array(rDC);
+    var Distance = 0;
+    var Length = 0;
+    var Dist = 0, BitLength = 0, Slot = 0;
+    var I;
+    for (I = 0; I < rDBitLengthCounts.length; I++, BitLength++) {
+        for (var J = 0; J < rDBitLengthCounts[I]; J++, Slot++, Dist += (1 << BitLength)) {
+            DDecode[Slot] = Dist;
+            DBits[Slot] = BitLength;
+        }
+    }
+
+    var Bits;
+    //tablesRead = false;
+
+    rOldDist = [0, 0, 0, 0];
+
+    lastDist = 0;
+    lastLength = 0;
+    var i;
+    for (i = UnpOldTable.length; i--;) {
+        UnpOldTable[i] = 0;
+    }
+
+    // read in Huffman tables
+    rarReadTables(bstream);
+
+    while (true) {
+        var num = rarDecodeNumber(bstream, LD);
+
+        if (num < 256) {
+            rBuffer.insertByte(num);
+            continue;
+        }
+        if (num >= 271) {
+            Length = rLDecode[num -= 271] + 3;
+            if ((Bits = rLBits[num]) > 0) {
+                Length += bstream.readBits(Bits);
+            }
+            var DistNumber = rarDecodeNumber(bstream, DD);
+            Distance = DDecode[DistNumber] + 1;
+            if ((Bits = DBits[DistNumber]) > 0) {
+                if (DistNumber > 9) {
+                    if (Bits > 4) {
+                        Distance += ((bstream.getBits() >>> (20 - Bits)) << 4);
+                        bstream.readBits(Bits - 4);
+                        //todo: check this
+                    }
+                    if (lowDistRepCount > 0) {
+                        lowDistRepCount--;
+                        Distance += prevLowDist;
+                    } else {
+                        var LowDist = rarDecodeNumber(bstream, LDD);
+                        if (LowDist === 16) {
+                            lowDistRepCount = rLowDistRepCount - 1;
+                            Distance += prevLowDist;
+                        } else {
+                            Distance += LowDist;
+                            prevLowDist = LowDist;
+                        }
+                    }
+                } else {
+                    Distance += bstream.readBits(Bits);
+                }
+            }
+            if (Distance >= 0x2000) {
+                Length++;
+                if (Distance >= 0x40000) {
+                    Length++;
+                }
+            }
+            rarInsertOldDist(Distance);
+            rarInsertLastMatch(Length, Distance);
+            rarCopyString(Length, Distance);
+            continue;
+        }
+        if (num === 256) {
+            if (!rarReadEndOfBlock(bstream)) {
+                break;
+            }
+            continue;
+        }
+        if (num === 257) {
+            if (!rarReadVMCode(bstream)) {
+                break;
+            }
+            continue;
+        }
+        if (num === 258) {
+            if (lastLength !== 0) {
+                rarCopyString(lastLength, lastDist);
+            }
+            continue;
+        }
+        if (num < 263) {
+            var DistNum = num - 259;
+            Distance = rOldDist[DistNum];
+
+            for (var I2 = DistNum; I2 > 0; I2--) {
+                rOldDist[I2] = rOldDist[I2 - 1];
+            }
+            rOldDist[0] = Distance;
+
+            var LengthNumber = rarDecodeNumber(bstream, RD);
+            Length = rLDecode[LengthNumber] + 2;
+            if ((Bits = rLBits[LengthNumber]) > 0) {
+                Length += bstream.readBits(Bits);
+            }
+            rarInsertLastMatch(Length, Distance);
+            rarCopyString(Length, Distance);
+            continue;
+        }
+        if (num < 272) {
+            Distance = rSDDecode[num -= 263] + 1;
+            if ((Bits = rSDBits[num]) > 0) {
+                Distance += bstream.readBits(Bits);
+            }
+            rarInsertOldDist(Distance);
+            rarInsertLastMatch(2, Distance);
+            rarCopyString(2, Distance);
+            continue;
+        }
+    } // while (true)
+    rarUpdateProgress();
+    rarWriteBuf();
+}
+
+/**
+ * Does stuff to the current byte buffer (rBuffer) based on
+ * the filters loaded into the RarVM and writes out to wBuffer.
+ */
+function rarWriteBuf() {
+    var writeSize = (rBuffer.ptr & MAXWINMASK);
+    var j;
+    var flt;
+    for (var i = 0; i < PrgStack.length; ++i) {
+        flt = PrgStack[i];
+        if (flt === null) {
+            continue;
+        }
+
+        if (flt.NextWindow) {
+            flt.NextWindow = false;
+            continue;
+        }
+
+        var blockStart = flt.BlockStart;
+        var blockLength = flt.BlockLength;
+        var parentPrg;
+
+        // WrittenBorder = wBuffer.ptr
+        if (((blockStart - wBuffer.ptr) & MAXWINMASK) < writeSize) {
+            if (wBuffer.ptr !== blockStart) {
+                // Copy blockStart bytes from rBuffer into wBuffer.
+                rarWriteArea(wBuffer.ptr, blockStart);
+                writeSize = (rBuffer.ptr - wBuffer.ptr) & MAXWINMASK;
+            }
+            if (blockLength <= writeSize) {
+                var blockEnd = (blockStart + blockLength) & MAXWINMASK;
+                if (blockStart < blockEnd || blockEnd === 0) {
+                    VM.setMemory(0, rBuffer.data.subarray(blockStart, blockStart + blockLength), blockLength);
+                } else {
+                    var firstPartLength = MAXWINSIZE - blockStart;
+                    VM.setMemory(0, rBuffer.data.subarray(blockStart, blockStart + firstPartLength), firstPartLength);
+                    VM.setMemory(firstPartLength, rBuffer.data, blockEnd);
+                }
+
+                parentPrg = Filters[flt.ParentFilter].Prg;
+                var prg = flt.Prg;
+
+                if (parentPrg.GlobalData.length > VM_FIXEDGLOBALSIZE) {
+                    // Copy global data from previous script execution if any.
+                    prg.GlobalData = new Uint8Array(parentPrg.GlobalData);
+                }
+
+                rarExecuteCode(prg);
+                var globalDataLen;
+
+                if (prg.GlobalData.length > VM_FIXEDGLOBALSIZE) {
+                    // Save global data for next script execution.
+                    globalDataLen = prg.GlobalData.length;
+                    if (parentPrg.GlobalData.length < globalDataLen) {
+                        parentPrg.GlobalData = new Uint8Array(globalDataLen);
+                    }
+                    parentPrg.GlobalData.set(
+                        this.mem_.subarray(VM_FIXEDGLOBALSIZE, VM_FIXEDGLOBALSIZE + globalDataLen),
+                        VM_FIXEDGLOBALSIZE);
+                } else {
+                    parentPrg.GlobalData = new Uint8Array(0);
+                }
+
+                var filteredData = prg.FilteredData;
+
+                PrgStack[i] = null;
+                while (i + 1 < PrgStack.length) {
+                    var nextFilter = PrgStack[i + 1];
+                    if (nextFilter === null || nextFilter.BlockStart !== blockStart ||
+                        nextFilter.BlockLength !== filteredData.length || nextFilter.NextWindow) {
+                        break;
+                    }
+
+                    // Apply several filters to same data block.
+
+                    VM.setMemory(0, filteredData, filteredData.length);
+
+                    parentPrg = Filters[nextFilter.ParentFilter].Prg;
+                    var nextPrg = nextFilter.Prg;
+
+                    globalDataLen = parentPrg.GlobalData.length;
+                    if (globalDataLen > VM_FIXEDGLOBALSIZE) {
+                        // Copy global data from previous script execution if any.
+                        nextPrg.GlobalData = new Uint8Array(globalDataLen);
+                        nextPrg.GlobalData.set(parentPrg.GlobalData.subarray(VM_FIXEDGLOBALSIZE, VM_FIXEDGLOBALSIZE + globalDataLen), VM_FIXEDGLOBALSIZE);
+                    }
+
+                    rarExecuteCode(nextPrg);
+
+                    if (nextPrg.GlobalData.length > VM_GLOBALMEMSIZE) {
+                        // Save global data for next script execution.
+                        globalDataLen = nextPrg.GlobalData.length;
+                        if (parentPrg.GlobalData.length < globalDataLen) {
+                            parentPrg.GlobalData = new Uint8Array(globalDataLen);
+                        }
+                        parentPrg.GlobalData.set(
+                            this.mem_.subarray(VM_FIXEDGLOBALSIZE, VM_FIXEDGLOBALSIZE + globalDataLen),
+                            VM_FIXEDGLOBALSIZE);
+                    } else {
+                        parentPrg.GlobalData = new Uint8Array(0);
+                    }
+
+                    filteredData = nextPrg.FilteredData;
+                    i++;
+                    PrgStack[i] = null;
+                } // while (i + 1 < PrgStack.length)
+
+                for (j = 0; j < filteredData.length; ++j) {
+                    wBuffer.insertByte(filteredData[j]);
+                }
+                writeSize = (rBuffer.ptr - wBuffer.ptr) & MAXWINMASK;
+            } else { // if (blockLength <= writeSize)
+                for (j = i; j < PrgStack.length; ++j) {
+                    flt = PrgStack[j];
+                    if (flt !== null && flt.NextWindow) {
+                        flt.NextWindow = false;
+                    }
+                }
+                //WrPtr=WrittenBorder;
+                return;
+            }
+        } // if (((blockStart - wBuffer.ptr) & MAXWINMASK) < writeSize)
+    } // for (var i = 0; i < PrgStack.length; ++i)
+
+    // Write any remaining bytes from rBuffer to wBuffer;
+    rarWriteArea(wBuffer.ptr, rBuffer.ptr);
+
+    // Now that the filtered buffer has been written, swap it back to rBuffer.
+    rBuffer = wBuffer;
+}
+
+/**
+ * Copy bytes from rBuffer to wBuffer.
+ * @param {number} startPtr The starting point to copy from rBuffer.
+ * @param {number} endPtr The ending point to copy from rBuffer.
+ */
+function rarWriteArea(startPtr, endPtr) {
+    if (endPtr < startPtr) {
+        console.error("endPtr < startPtr, endPtr=" + endPtr + ", startPtr=" + startPtr);
+        //    rarWriteData(startPtr, -(int)StartPtr & MAXWINMASK);
+        //    RarWriteData(0, endPtr);
+        return;
+    } else if (startPtr < endPtr) {
+        rarWriteData(startPtr, endPtr - startPtr);
+    }
+}
+
+/**
+ * Writes bytes into wBuffer from rBuffer.
+ * @param {number} offset The starting point to copy bytes from rBuffer.
+ * @param {number} numBytes The number of bytes to copy.
+ */
+function rarWriteData(offset, numBytes) {
+    if (wBuffer.ptr >= rBuffer.data.length) {
+        return;
+    }
+    var leftToWrite = rBuffer.data.length - wBuffer.ptr;
+    if (numBytes > leftToWrite) {
+        numBytes = leftToWrite;
+    }
+    for (var i = 0; i < numBytes; ++i) {
+        wBuffer.insertByte(rBuffer.data[offset + i]);
+    }
+}
+
+/**
+ * @param {VM_PreparedProgram} prg
+ */
+function rarExecuteCode(prg) {
+    if (prg.GlobalData.length > 0) {
+        var writtenFileSize = wBuffer.ptr;
+        prg.InitR[6] = writtenFileSize;
+        VM.setLowEndianValue(prg.GlobalData, writtenFileSize, 0x24);
+        VM.setLowEndianValue(prg.GlobalData, (writtenFileSize >>> 32) >> 0, 0x28);
+        VM.execute(prg);
+    }
+}
+
+function rarReadEndOfBlock(bstream) {
+    rarUpdateProgress();
+
+    var NewTable = false,
+        NewFile = false;
+    if (bstream.readBits(1)) {
+        NewTable = true;
+    } else {
+        NewFile = true;
+        NewTable = !!bstream.readBits(1);
+    }
+    //tablesRead = !NewTable;
+    return !(NewFile || (NewTable && !rarReadTables(bstream)));
+}
+
+function rarInsertLastMatch(length, distance) {
+    lastDist = distance;
+    lastLength = length;
+}
+
+function rarInsertOldDist(distance) {
+    rOldDist.splice(3, 1);
+    rOldDist.splice(0, 0, distance);
+}
+
+/**
+ * Copies len bytes from distance bytes ago in the buffer to the end of the
+ * current byte buffer.
+ * @param {number} length How many bytes to copy.
+ * @param {number} distance How far back in the buffer from the current write
+ *     pointer to start copying from.
+ */
+function rarCopyString(length, distance) {
+    var srcPtr = rBuffer.ptr - distance;
+    if (srcPtr < 0) {
+        var l = rOldBuffers.length;
+        while (srcPtr < 0) {
+            srcPtr = rOldBuffers[--l].data.length + srcPtr;
+        }
+        // TODO: lets hope that it never needs to read beyond file boundaries
+        while (length--) {
+            rBuffer.insertByte(rOldBuffers[l].data[srcPtr++]);
+        }
+    }
+    if (length > distance) {
+        while (length--) {
+            rBuffer.insertByte(rBuffer.data[srcPtr++]);
+        }
+    } else {
+        rBuffer.insertBytes(rBuffer.data.subarray(srcPtr, srcPtr + length));
+    }
+}
+
+/**
+ * @param {RarLocalFile} v
+ */
+function unpack(v) {
+    // TODO: implement what happens when unpVer is < 15
+    var Ver = v.header.unpVer <= 15 ? 15 : v.header.unpVer;
+    // var Solid = v.header.LHD_SOLID;
+    var bstream = new bitjs.io.BitStream(v.fileData.buffer, true /* rtl */, v.fileData.byteOffset, v.fileData.byteLength);
+
+    rBuffer = new bitjs.io.ByteBuffer(v.header.unpackedSize);
+
+    info("Unpacking " + v.filename + " RAR v" + Ver);
+
+    switch (Ver) {
+        case 15: // rar 1.5 compression
+            unpack15(); //(bstream, Solid);
+            break;
+        case 20: // rar 2.x compression
+        case 26: // files larger than 2GB
+            unpack20(bstream); //, Solid);
+            break;
+        case 29: // rar 3.x compression
+        case 36: // alternative hash
+            wBuffer = new bitjs.io.ByteBuffer(rBuffer.data.length);
+            unpack29(bstream);
+            break;
+    } // switch(method)
+
+    rOldBuffers.push(rBuffer);
+    // TODO: clear these old buffers when there's over 4MB of history
+    return rBuffer.data;
+}
+
+// bstream is a bit stream
+var RarLocalFile = function(bstream) {
+    this.header = new RarVolumeHeader(bstream);
+    this.filename = this.header.filename;
+
+    if (this.header.headType !== FILE_HEAD && this.header.headType !== ENDARC_HEAD && this.header.headType !== SERVICE_HEAD) {
+        this.isValid = false;
+        info("Error! RAR Volume did not include a FILE_HEAD header ");
+    } else {
+        // read in the compressed data
+        this.fileData = null;
+        if (this.header.packSize > 0) {
+            this.fileData = bstream.readBytes(this.header.packSize);
+            if (this.header.headType === FILE_HEAD) {
+                this.isValid = true;
+            }
+        }
+    }
+};
+
+RarLocalFile.prototype.unrar5 = function() {
+    //if (!this.header.flags.LHD_SPLIT_BEFORE) {
+        // unstore file
+        // No compression
+        if (this.header.method === 0x00) {
+            info("Unstore " + this.filename);
+            this.isValid = true;
+
+            currentBytesUnarchivedInFile += this.fileData.length;
+            currentBytesUnarchived += this.fileData.length;
+
+            // Create a new buffer and copy it over.
+            var len = this.header.packSize;
+            var newBuffer = new bitjs.io.ByteBuffer(len);
+            newBuffer.insertBytes(this.fileData);
+            this.fileData = newBuffer.data;
+        } else {
+            this.isValid = true;
+            this.fileData = unpack(this);
+        }
+    //}
+};
+
+var unrar5 = function(arrayBuffer) {
+    currentFilename = "";
+    currentFileNumber = 0;
+    currentBytesUnarchivedInFile = 0;
+    currentBytesUnarchived = 0;
+    totalUncompressedBytesInArchive = 0;
+    totalFilesInArchive = 0;
+
+    // postMessage(new bitjs.archive.UnarchiveStartEvent());
+    var bstream = new bitjs.io.BitStream(arrayBuffer, false /* rtl */);
+
+    var header = new RarMainVolumeHeader(bstream);
+    if (header.crc === 0x6152 &&
+        header.headType === 0x72 &&
+        header.flags.value === 0x1A21 &&
+        header.headSize === 7) {
+        info("Found RAR signature");
+
+        var mhead = new RarVolumeHeader(bstream);
+        if (mhead.headType !== MAIN_HEAD) {
+            info("Error! RAR did not include a MAIN_HEAD header");
+        } else {
+            var localFiles = [];
+            var localFile = null;
+            do {
+                try {
+                    localFile = new RarLocalFile(bstream);
+                    info("RAR localFile isValid=" + localFile.isValid + ", volume packSize=" + localFile.header.packSize);
+                    if (localFile && localFile.isValid && localFile.header.packSize > 0) {
+                        totalUncompressedBytesInArchive += localFile.header.unpackedSize;
+                        localFiles.push(localFile);
+                    } else if (localFile.header.packSize === 0 && localFile.header.unpackedSize === 0) {
+                        localFile.isValid = true;
+                    }
+                } catch (err) {
+                    break;
+                }
+                //info("bstream" + bstream.bytePtr+"/"+bstream.bytes.length);
+            } while (localFile.isValid);
+            totalFilesInArchive = localFiles.length;
+
+            // now we have all information but things are unpacked
+            localFiles.sort(alphanumCase);
+
+            info(localFiles.map(function(a) {
+                return a.filename;
+            }).join(", "));
+            for (var i = 0; i < localFiles.length; ++i) {
+                var localfile = localFiles[i];
+
+                // update progress
+                currentFilename = localfile.header.filename;
+                currentBytesUnarchivedInFile = 0;
+
+                // actually do the unzipping
+                localfile.unrar5();
+
+                if (localfile.isValid) {
+                    postMessage(new bitjs.archive.UnarchiveExtractEvent(localfile));
+                    postProgress();
+                }
+            }
+
+            postProgress();
+        }
+    } else {
+        err("Invalid RAR file");
+    }
+    // postMessage(new bitjs.archive.UnarchiveFinishEvent());
+};
+
+// event.data.file has the ArrayBuffer.
+onmessage = function(event) {
+    var ab = event.data.file;
+    unrar5(ab, true);
+};
diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
index 73e1c320..f7ab8539 100644
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -145,44 +145,16 @@ if ($("body.book").length > 0) {
     $(".blur-wrapper")
         .prepend('<div><img alt="Blurred cover" class="bg-blur" src="' + cover + '"></div>');
 
-    // Fix-up book detail headings
-    publisher = $(".publishers p span").text().split(":");
-    $(".publishers p span").remove();
-    $.each(publisher, function (i, val) {
-        $(".publishers").append("<span>" + publisher[i] + "</span>");
-    });
-    $(".publishers span:nth-child(3)").text(function () {
-        return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
-    });
-
-    // Fix-up book custom colums headings
-    // real_custom_column = $( '.real_custom_columns' ).text().split( ':' );
-    real_custom_column = $(".real_custom_columns");
-    // $( ".real_custom_columns" ).remove();
-    $.each(real_custom_column, function (i, val) {
-        var split = $(this).text().split(":");
-        real_cc_key = split.shift();
-        real_cc_value = split.join(":");
-        $(this).text("");
-        if (real_cc_value != "") {
-            $(this).append("<span>" + real_cc_key + "</span><span>" + real_cc_value + "</span>");
+    // Metadata Fields - Publishers, Published, Languages and Custom
+    $('.publishers, .publishing-date, .real_custom_columns, .languages').each(function () {
+        var splitText = $(this).text().split(':');
+        var label = splitText.shift().trim();
+        var value = splitText.join(':').trim();
+        // Preserve Links
+        if ($(this).find('a').length) {
+            value = $(this).find('a').first().removeClass();
         }
-    });
-    //$( '.real_custom_columns:nth-child(3)' ).text(function() {
-    //return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
-    //});
-
-    published = $(".publishing-date p")
-        .text().split(": ");
-    $(".publishing-date p").remove();
-    $.each(published, function (i, val) {
-        $(".publishing-date").append("<span>" + published[i] + "</span>");
-    });
-
-    languages = $(".languages p span").text().split(": ");
-    $(".languages p span").remove();
-    $.each(languages, function (i, val) {
-        $(".languages").append("<span>" + languages[i] + "</span>");
+        $(this).html('<span>' + label + '</span><span></span>').find('span').last().append(value);
     });
 
     $(".book-meta h2:first").clone()
@@ -246,11 +218,6 @@ if ($("body.book").length > 0) {
         $("#add-to-shelves").toggle();
     });
 
-    // Fix formatting error on book detail languages
-    if (!$(".book-meta > .bookinfo > .languages > span:last-of-type").text().startsWith(" ")) {
-        $(".book-meta > .bookinfo > .languages > span:last-of-type").prepend(" ");
-    }
-
     //Work to reposition dropdowns. Does not currently solve for
     //screen resizing
     function dropdownToggle() {
@@ -710,7 +677,7 @@ $(".navbar-collapse.collapse.in").before('<div class="sidebar-backdrop"></div>')
 // Get rid of leading white space
 recentlyAdded = $("#nav_new a:contains('Recently')").text().trim();
 $("#nav_new a:contains('Recently')").contents().filter(function () {
-    return this.nodeType == 3
+    return this.nodeType === 3
 }).each(function () {
     this.textContent = this.textContent.replace(" Recently Added", recentlyAdded);
 });
diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js
index 35515aa1..8cedf688 100644
--- a/cps/static/js/edit_books.js
+++ b/cps/static/js/edit_books.js
@@ -1,7 +1,7 @@
 /**
  * Created by SpeedProg on 05.04.2015.
  */
-/* global Bloodhound, language, Modernizr, tinymce */
+/* global Bloodhound, language, Modernizr, tinymce, getPath */
 
 if ($("#description").length) {
     tinymce.init({
@@ -78,10 +78,10 @@ function prefixedSource(prefix, query, cb, bhAdapter) {
     });
 }
 
-function getPath() {
+/*function getPath() {
     var jsFileLocation = $("script[src*=edit_books]").attr("src");  // the js file path
     return jsFileLocation.substr(0, jsFileLocation.search("/static/js/edit_books.js"));   // the js folder path
-}
+}*/
 
 var authors = new Bloodhound({
     name: "authors",
@@ -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_grid.js b/cps/static/js/filter_grid.js
index 457b9055..d57d155f 100644
--- a/cps/static/js/filter_grid.js
+++ b/cps/static/js/filter_grid.js
@@ -24,31 +24,47 @@ var $list = $("#list").isotope({
 });
 
 $("#desc").click(function() {
+    var page = $(this).data("id");
+    $.ajax({
+        method:"post",
+        contentType: "application/json; charset=utf-8",
+        dataType: "json",
+        url: window.location.pathname + "/../../ajax/view",
+        data: "{\"" + page + "\": {\"dir\": \"desc\"}}",
+    });
     $list.isotope({
         sortBy: "name",
         sortAscending: true
     });
-    return;
 });
 
 $("#asc").click(function() {
+    var page = $(this).data("id");
+    $.ajax({
+        method:"post",
+        contentType: "application/json; charset=utf-8",
+        dataType: "json",
+        url: window.location.pathname + "/../../ajax/view",
+        data: "{\"" + page + "\": {\"dir\": \"asc\"}}",
+    });
     $list.isotope({
         sortBy: "name",
         sortAscending: false
     });
-    return;
 });
 
 $("#all").click(function() {
     // go through all elements and make them visible
     $list.isotope({ filter: function() {
         return true;
-      } })
+    }
+    });
 });
 
 $(".char").click(function() {
     var character = this.innerText;
     $list.isotope({ filter: function() {
-        return this.attributes["data-id"].value.charAt(0).toUpperCase() == character;
-      } })
+        return this.attributes["data-id"].value.charAt(0).toUpperCase() === character;
+    }
+    });
 });
diff --git a/cps/static/js/filter_list.js b/cps/static/js/filter_list.js
index 8291f0ac..ef7639fa 100644
--- a/cps/static/js/filter_list.js
+++ b/cps/static/js/filter_list.js
@@ -19,6 +19,10 @@ var direction = 0;  // Descending order
 var sort = 0;       // Show sorted entries
 
 $("#sort_name").click(function() {
+    var className = $("h1").attr("Class") + "_sort_name";
+    var obj = {};
+    obj[className] = sort;
+
     var count = 0;
     var index = 0;
     var store;
@@ -40,9 +44,7 @@ $("#sort_name").click(function() {
             count++;
         }
     });
-    /*listItems.sort(function(a,b){
-        return $(a).children()[1].innerText.localeCompare($(b).children()[1].innerText)
-    });*/
+
     // Find count of middle element
     if (count > 20) {
         var middle = parseInt(count / 2, 10) + (count % 2);
@@ -66,6 +68,14 @@ $("#desc").click(function() {
     if (direction === 0) {
         return;
     }
+    var page = $(this).data("id");
+    $.ajax({
+        method:"post",
+        contentType: "application/json; charset=utf-8",
+        dataType: "json",
+        url: window.location.pathname + "/../../ajax/view",
+        data: "{\"" + page + "\": {\"dir\": \"desc\"}}",
+    });
     var index = 0;
     var list = $("#list");
     var second = $("#second");
@@ -78,7 +88,7 @@ $("#desc").click(function() {
     // Find count of middle element
     var count = $(".row:visible").length;
     if (count > 20) {
-        middle = parseInt(count / 2) + (count % 2);
+        middle = parseInt(count / 2, 10) + (count % 2);
 
         //var middle = parseInt(count / 2) + (count % 2);
         // search for the middle of all visible elements
@@ -102,9 +112,18 @@ $("#desc").click(function() {
 
 
 $("#asc").click(function() {
+
     if (direction === 1) {
         return;
     }
+    var page = $(this).data("id");
+    $.ajax({
+        method:"post",
+        contentType: "application/json; charset=utf-8",
+        dataType: "json",
+        url: window.location.pathname + "/../../ajax/view",
+        data: "{\"" + page + "\": {\"dir\": \"asc\"}}",
+    });
     var index = 0;
     var list = $("#list");
     var second = $("#second");
@@ -116,7 +135,7 @@ $("#asc").click(function() {
     // Find count of middle element
     var count = $(".row:visible").length;
     if (count > 20) {
-        var middle = parseInt(count / 2) + (count % 2);
+        var middle = parseInt(count / 2, 10) + (count % 2);
 
         //var middle = parseInt(count / 2) + (count % 2);
         // search for the middle of all visible elements
@@ -131,7 +150,6 @@ $("#asc").click(function() {
         });
 
         // middle = parseInt(elementLength / 2) + (elementLength % 2);
-
         list.append(reversed.slice(0, index));
         second.append(reversed.slice(index, elementLength));
     } else {
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index e27608ab..04c1d270 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -108,7 +108,7 @@ $(function () {
                         tags: result.volumeInfo.categories || [],
                         rating: result.volumeInfo.averageRating || 0,
                         cover: result.volumeInfo.imageLinks ?
-                            result.volumeInfo.imageLinks.thumbnail : "/static/generic_cover.jpg",
+                            result.volumeInfo.imageLinks.thumbnail : location + "/../../../static/generic_cover.jpg",
                         url: "https://books.google.com/books?id=" + result.id,
                         source: {
                             id: "google",
@@ -138,8 +138,8 @@ $(function () {
                         seriesTitle = result.series.title;
                     }
                     var dateFomers = result.pubdate.split("-");
-                    var publishedYear = parseInt(dateFomers[0]);
-                    var publishedMonth = parseInt(dateFomers[1]);
+                    var publishedYear = parseInt(dateFomers[0], 10);
+                    var publishedMonth = parseInt(dateFomers[1], 10);
                     var publishedDate = new Date(publishedYear, publishedMonth - 1, 1);
 
                     publishedDate = formatDate(publishedDate);
@@ -194,8 +194,8 @@ $(function () {
                     } else {
                         dateFomers = result.date_added.split("-");
                     }
-                    var publishedYear = parseInt(dateFomers[0]);
-                    var publishedMonth = parseInt(dateFomers[1]);
+                    var publishedYear = parseInt(dateFomers[0], 10);
+                    var publishedMonth = parseInt(dateFomers[1], 10);
                     var publishedDate = new Date(publishedYear, publishedMonth - 1, 1);
 
                     publishedDate = formatDate(publishedDate);
@@ -253,7 +253,7 @@ $(function () {
     }
 
     function dbSearchBook (title) {
-        var apikey = "0df993c66c0c636e29ecbb5344252a4a";
+        var apikey = "054022eaeae0b00e0fc068c0c0a2102a";
         $.ajax({
             url: douban + dbSearch + "?apikey=" + apikey + "&q=" + title + "&fields=all&count=10",
             type: "GET",
diff --git a/cps/static/js/kthoom.js b/cps/static/js/kthoom.js
index 33a2ac0e..56038fc6 100644
--- a/cps/static/js/kthoom.js
+++ b/cps/static/js/kthoom.js
@@ -141,9 +141,27 @@ var createURLFromArray = function(array, mimeType) {
 kthoom.ImageFile = function(file) {
     this.filename = file.filename;
     var fileExtension = file.filename.split(".").pop().toLowerCase();
-    this.mimeType = fileExtension === "png" ? "image/png" :
-        (fileExtension === "jpg" || fileExtension === "jpeg") ? "image/jpeg" :
-            fileExtension === "gif" ? "image/gif" : fileExtension === "svg" ? "image/xml+svg" : undefined;
+    switch (fileExtension) {
+        case "jpg":
+        case "jpeg":
+            this.mimeType = "image/jpeg";
+            break;
+        case "png":
+            this.mimeType = "image/png";
+            break;
+        case "gif":
+            this.mimeType = "image/gif";
+            break;
+        case "svg":
+            this.mimeType = "image/svg+xml";
+            break;
+        case "webp":
+            this.mimeType = "image/webp";
+            break;
+        default:
+            this.mimeType = undefined;
+            break;
+    }
     if ( this.mimeType !== undefined) {
         this.dataURI = createURLFromArray(file.fileData, this.mimeType);
         this.data = file;
@@ -331,7 +349,7 @@ function setImage(url) {
                         $("#mainText").innerHTML("<iframe style=\"width:100%;height:700px;border:0\" src=\"data:text/html," + escape(xhr.responseText) + "\"></iframe>");
                     };
                     xhr.send(null);
-                } else if (!/(jpg|jpeg|png|gif)$/.test(imageFiles[currentImage].filename) && imageFiles[currentImage].data.uncompressedSize < 10 * 1024) {
+                } else if (!/(jpg|jpeg|png|gif|webp)$/.test(imageFiles[currentImage].filename) && imageFiles[currentImage].data.uncompressedSize < 10 * 1024) {
                     xhr.open("GET", url, true);
                     xhr.onload = function() {
                         $("#mainText").css("display", "");
@@ -635,6 +653,14 @@ function init(filename) {
     // Focus the scrollable area so that keyboard scrolling work as expected
     $("#mainContent").focus();
 
+    $("#mainContent").swipe( {
+        swipeRight:function() {
+            showLeftPage();
+        },
+        swipeLeft:function() {
+            showRightPage();
+        },
+    });
     $("#mainImage").click(function(evt) {
         // Firefox does not support offsetX/Y so we have to manually calculate
         // where the user clicked in the image.
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.el.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.el.min.js
new file mode 100644
index 00000000..046e9eb5
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.el.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.el={days:["Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο"],daysShort:["Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ"],daysMin:["Κυ","Δε","Τρ","Τε","Πε","Πα","Σα"],months:["Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος","Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος"],monthsShort:["Ιαν","Φεβ","Μαρ","Απρ","Μάι","Ιουν","Ιουλ","Αυγ","Σεπ","Οκτ","Νοε","Δεκ"],today:"Σήμερα",clear:"Καθαρισμός",weekStart:1,format:"d/m/yyyy"}}(jQuery);
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.tr.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.tr.min.js
new file mode 100644
index 00000000..7889b113
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.tr.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.tr={days:["Pazar","Pazartesi","Salı","Çarşamba","Perşembe","Cuma","Cumartesi"],daysShort:["Pz","Pzt","Sal","Çrş","Prş","Cu","Cts"],daysMin:["Pz","Pzt","Sa","Çr","Pr","Cu","Ct"],months:["Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık"],monthsShort:["Oca","Şub","Mar","Nis","May","Haz","Tem","Ağu","Eyl","Eki","Kas","Ara"],today:"Bugün",clear:"Temizle",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh_Hans_CN.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js
rename to cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh_Hans_CN.min.js
diff --git a/cps/static/js/libs/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/libs/bootstrap-table/bootstrap-table-editable.min.js b/cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
index e93e8246..cd411037 100644
--- a/cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
+++ b/cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{editable:!0,onEditableInit:function(){return!1},onEditableSave:function(){return!1},onEditableShown:function(){return!1},onEditableHidden:function(){return!1}}),a.extend(a.fn.bootstrapTable.Constructor.EVENTS,{"editable-init.bs.table":"onEditableInit","editable-save.bs.table":"onEditableSave","editable-shown.bs.table":"onEditableShown","editable-hidden.bs.table":"onEditableHidden"});var b=a.fn.bootstrapTable.Constructor,c=b.prototype.initTable,d=b.prototype.initBody;b.prototype.initTable=function(){var b=this;c.apply(this,Array.prototype.slice.apply(arguments)),this.options.editable&&a.each(this.columns,function(c,d){if(d.editable){var e={},f=[],g="editable-",h=function(a,b){var c=a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()});if(c.slice(0,g.length)==g){var d=c.replace(g,"data-");e[d]=b}};a.each(b.options,h),d.formatter=d.formatter||function(a){return a},d._formatter=d._formatter?d._formatter:d.formatter,d.formatter=function(c,g,i){var j=d._formatter?d._formatter(c,g,i):c;a.each(d,h),a.each(e,function(a,b){f.push(" "+a+'="'+b+'"')});var k=!1;return d.editable.hasOwnProperty("noeditFormatter")&&(k=d.editable.noeditFormatter(c,g,i)),k===!1?['<a href="javascript:void(0)"',' data-name="'+d.field+'"',' data-pk="'+g[b.options.idField]+'"',' data-value="'+j+'"',f.join(""),"></a>"].join(""):k}}})},b.prototype.initBody=function(){var b=this;d.apply(this,Array.prototype.slice.apply(arguments)),this.options.editable&&(a.each(this.columns,function(c,d){d.editable&&(b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("save").on("save",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g],i=h[d.field];a(this).data("value",e.submitValue),h[d.field]=e.submitValue,b.trigger("editable-save",d.field,h,i,a(this)),b.resetFooter()}),b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("shown").on("shown",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g];b.trigger("editable-shown",d.field,h,a(this),e)}),b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("hidden").on("hidden",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g];b.trigger("editable-hidden",d.field,h,a(this),e)}))}),this.trigger("editable-init"))}}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,u=Object.getOwnPropertyDescriptor,f={f:u&&!c.call({1:2},1)?function(t){var e=u(this,t);return!!e&&e.enumerable}:c},l=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},s={}.toString,d=function(t){return s.call(t).slice(8,-1)},p="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?p.call(t,""):Object(t)}:Object,v=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return h(v(t))},g=function(t){return"object"==typeof t?null!==t:"function"==typeof t},b=function(t,e){if(!g(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!g(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!g(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!g(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,x=function(t,e){return m.call(t,e)},O=o.document,w=g(O)&&g(O.createElement),E=function(t){return w?O.createElement(t):{}},j=!a&&!i((function(){return 7!=Object.defineProperty(E("div"),"a",{get:function(){return 7}}).a})),S=Object.getOwnPropertyDescriptor,T={f:a?S:function(t,e){if(t=y(t),e=b(e,!0),j)try{return S(t,e)}catch(t){}if(x(t,e))return l(!f.f.call(t,e),t[e])}},P=function(t){if(!g(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,_={f:a?A:function(t,e,n){if(P(t),e=b(e,!0),P(n),j)try{return A(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},I=a?function(t,e,n){return _.f(t,e,l(1,n))}:function(t,e,n){return t[e]=n,t},R=function(t,e){try{I(o,t,e)}catch(n){o[t]=e}return e},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),k=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return k.call(t)});var M,$,F,D=C.inspectSource,N=o.WeakMap,q="function"==typeof N&&/native code/.test(D(N)),B=n((function(t){(t.exports=function(t,e){return C[t]||(C[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),L=0,K=Math.random(),V=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++L+K).toString(36)},U=B("keys"),W=function(t){return U[t]||(U[t]=V(t))},z={},Y=o.WeakMap;if(q){var G=new Y,H=G.get,Q=G.has,X=G.set;M=function(t,e){return X.call(G,t,e),e},$=function(t){return H.call(G,t)||{}},F=function(t){return Q.call(G,t)}}else{var Z=W("state");z[Z]=!0,M=function(t,e){return I(t,Z,e),e},$=function(t){return x(t,Z)?t[Z]:{}},F=function(t){return x(t,Z)}}var J,tt,et={set:M,get:$,has:F,enforce:function(t){return F(t)?$(t):M(t,{})},getterFor:function(t){return function(e){var n;if(!g(e)||(n=$(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},nt=n((function(t){var e=et.get,n=et.enforce,r=String(String).split("String");(t.exports=function(t,e,i,a){var c=!!a&&!!a.unsafe,u=!!a&&!!a.enumerable,f=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||x(i,"name")||I(i,"name",e),n(i).source=r.join("string"==typeof e?e:"")),t!==o?(c?!f&&t[e]&&(u=!0):delete t[e],u?t[e]=i:I(t,e,i)):u?t[e]=i:R(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||D(this)}))})),rt=o,ot=function(t){return"function"==typeof t?t:void 0},it=function(t,e){return arguments.length<2?ot(rt[t])||ot(o[t]):rt[t]&&rt[t][e]||o[t]&&o[t][e]},at=Math.ceil,ct=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?ct:at)(t)},ft=Math.min,lt=function(t){return t>0?ft(ut(t),9007199254740991):0},st=Math.max,dt=Math.min,pt=function(t){return function(e,n,r){var o,i=y(e),a=lt(i.length),c=function(t,e){var n=ut(t);return n<0?st(n+e,0):dt(n,e)}(r,a);if(t&&n!=n){for(;a>c;)if((o=i[c++])!=o)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},ht={includes:pt(!0),indexOf:pt(!1)},vt=ht.indexOf,yt=function(t,e){var n,r=y(t),o=0,i=[];for(n in r)!x(z,n)&&x(r,n)&&i.push(n);for(;e.length>o;)x(r,n=e[o++])&&(~vt(i,n)||i.push(n));return i},gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],bt=gt.concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return yt(t,bt)}},xt={f:Object.getOwnPropertySymbols},Ot=it("Reflect","ownKeys")||function(t){var e=mt.f(P(t)),n=xt.f;return n?e.concat(n(t)):e},wt=function(t,e){for(var n=Ot(e),r=_.f,o=T.f,i=0;i<n.length;i++){var a=n[i];x(t,a)||r(t,a,o(e,a))}},Et=/#|\.prototype\./,jt=function(t,e){var n=Tt[St(t)];return n==At||n!=Pt&&("function"==typeof e?i(e):!!e)},St=jt.normalize=function(t){return String(t).replace(Et,".").toLowerCase()},Tt=jt.data={},Pt=jt.NATIVE="N",At=jt.POLYFILL="P",_t=jt,It=T.f,Rt=function(t,e){var n,r,i,a,c,u=t.target,f=t.global,l=t.stat;if(n=f?o:l?o[u]||R(u,{}):(o[u]||{}).prototype)for(r in e){if(a=e[r],i=t.noTargetGet?(c=It(n,r))&&c.value:n[r],!_t(f?r:u+(l?".":"#")+r,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;wt(a,i)}(t.sham||i&&i.sham)&&I(a,"sham",!0),nt(n,r,a,t)}},Ct=Array.isArray||function(t){return"Array"==d(t)},kt=function(t){return Object(v(t))},Mt=function(t,e,n){var r=b(e);r in t?_.f(t,r,l(0,n)):t[r]=n},$t=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ft=$t&&!Symbol.sham&&"symbol"==typeof Symbol(),Dt=B("wks"),Nt=o.Symbol,qt=Ft?Nt:V,Bt=function(t){return x(Dt,t)||($t&&x(Nt,t)?Dt[t]=Nt[t]:Dt[t]=qt("Symbol."+t)),Dt[t]},Lt=Bt("species"),Kt=function(t,e){var n;return Ct(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!Ct(n.prototype)?g(n)&&null===(n=n[Lt])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},Vt=it("navigator","userAgent")||"",Ut=o.process,Wt=Ut&&Ut.versions,zt=Wt&&Wt.v8;zt?tt=(J=zt.split("."))[0]+J[1]:Vt&&(!(J=Vt.match(/Edge\/(\d+)/))||J[1]>=74)&&(J=Vt.match(/Chrome\/(\d+)/))&&(tt=J[1]);var Yt,Gt=tt&&+tt,Ht=Bt("species"),Qt=Bt("isConcatSpreadable"),Xt=Gt>=51||!i((function(){var t=[];return t[Qt]=!1,t.concat()[0]!==t})),Zt=(Yt="concat",Gt>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Yt](Boolean).foo}))),Jt=function(t){if(!g(t))return!1;var e=t[Qt];return void 0!==e?!!e:Ct(t)};Rt({target:"Array",proto:!0,forced:!Xt||!Zt},{concat:function(t){var e,n,r,o,i,a=kt(this),c=Kt(a,0),u=0;for(e=-1,r=arguments.length;e<r;e++)if(i=-1===e?a:arguments[e],Jt(i)){if(u+(o=lt(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(n=0;n<o;n++,u++)n in i&&Mt(c,u,i[n])}else{if(u>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,u++,i)}return c.length=u,c}});var te,ee=function(t,e,n){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}},ne=[].push,re=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,a=5==t||i;return function(c,u,f,l){for(var s,d,p=kt(c),v=h(p),y=ee(u,f,3),g=lt(v.length),b=0,m=l||Kt,x=e?m(c,g):n?m(c,0):void 0;g>b;b++)if((a||b in v)&&(d=y(s=v[b],b,p),t))if(e)x[b]=d;else if(d)switch(t){case 3:return!0;case 5:return s;case 6:return b;case 2:ne.call(x,s)}else if(o)return!1;return i?-1:r||o?o:x}},oe={forEach:re(0),map:re(1),filter:re(2),some:re(3),every:re(4),find:re(5),findIndex:re(6)},ie=Object.keys||function(t){return yt(t,gt)},ae=a?Object.defineProperties:function(t,e){P(t);for(var n,r=ie(e),o=r.length,i=0;o>i;)_.f(t,n=r[i++],e[n]);return t},ce=it("document","documentElement"),ue=W("IE_PROTO"),fe=function(){},le=function(t){return"<script>"+t+"<\/script>"},se=function(){try{te=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;se=te?function(t){t.write(le("")),t.close();var e=t.parentWindow.Object;return t=null,e}(te):((e=E("iframe")).style.display="none",ce.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(le("document.F=Object")),t.close(),t.F);for(var n=gt.length;n--;)delete se.prototype[gt[n]];return se()};z[ue]=!0;var de=Object.create||function(t,e){var n;return null!==t?(fe.prototype=P(t),n=new fe,fe.prototype=null,n[ue]=t):n=se(),void 0===e?n:ae(n,e)},pe=Bt("unscopables"),he=Array.prototype;null==he[pe]&&_.f(he,pe,{configurable:!0,value:de(null)});var ve,ye=oe.find,ge=!0;"find"in[]&&Array(1).find((function(){ge=!1})),Rt({target:"Array",proto:!0,forced:ge},{find:function(t){return ye(this,t,arguments.length>1?arguments[1]:void 0)}}),ve="find",he[pe][ve]=!0;var be=function(t,e){var n=[][t];return!n||!i((function(){n.call(null,e||function(){throw 1},1)}))},me=ht.indexOf,xe=[].indexOf,Oe=!!xe&&1/[1].indexOf(1,-0)<0,we=be("indexOf");Rt({target:"Array",proto:!0,forced:Oe||we},{indexOf:function(t){return Oe?xe.apply(this,arguments)||0:me(this,t,arguments.length>1?arguments[1]:void 0)}});var Ee=[].join,je=h!=Object,Se=be("join",",");Rt({target:"Array",proto:!0,forced:je||Se},{join:function(t){return Ee.call(y(this),void 0===t?",":t)}});var Te=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function Pe(t,e){return RegExp(t,e)}var Ae,_e,Ie={UNSUPPORTED_Y:i((function(){var t=Pe("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:i((function(){var t=Pe("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Re=RegExp.prototype.exec,Ce=String.prototype.replace,ke=Re,Me=(Ae=/a/,_e=/b*/g,Re.call(Ae,"a"),Re.call(_e,"a"),0!==Ae.lastIndex||0!==_e.lastIndex),$e=Ie.UNSUPPORTED_Y||Ie.BROKEN_CARET,Fe=void 0!==/()??/.exec("")[1];(Me||Fe||$e)&&(ke=function(t){var e,n,r,o,i=this,a=$e&&i.sticky,c=Te.call(i),u=i.source,f=0,l=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),l=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(u="(?: "+u+")",l=" "+l,f++),n=new RegExp("^(?:"+u+")",c)),Fe&&(n=new RegExp("^"+u+"$(?!\\s)",c)),Me&&(e=i.lastIndex),r=Re.call(a?n:i,l),a?r?(r.input=r.input.slice(f),r[0]=r[0].slice(f),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:Me&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),Fe&&r&&r.length>1&&Ce.call(r[0],n,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var De=ke;Rt({target:"RegExp",proto:!0,forced:/./.exec!==De},{exec:De});var Ne=Bt("species"),qe=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),Be="$0"==="a".replace(/./,"$0"),Le=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]})),Ke=function(t){return function(e,n){var r,o,i=String(v(e)),a=ut(n),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(o=i.charCodeAt(a+1))<56320||o>57343?t?i.charAt(a):r:t?i.slice(a,a+2):o-56320+(r-55296<<10)+65536}},Ve={codeAt:Ke(!1),charAt:Ke(!0)}.charAt,Ue=function(t,e,n){return e+(n?Ve(t,e).length:1)},We=function(t,e){var n=t.exec;if("function"==typeof n){var r=n.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==d(t))throw TypeError("RegExp#exec called on incompatible receiver");return De.call(t,e)},ze=Math.max,Ye=Math.min,Ge=Math.floor,He=/\$([$&'`]|\d\d?|<[^>]*>)/g,Qe=/\$([$&'`]|\d\d?)/g;function Xe(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ze(t){return(Ze=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Je(t,e){return(Je=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function tn(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function en(t,e,n){return(en="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ze(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}!function(t,e,n,r){var o=Bt(t),a=!i((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),c=a&&!i((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[Ne]=function(){return n},n.flags="",n[o]=/./[o]),n.exec=function(){return e=!0,null},n[o](""),!e}));if(!a||!c||"replace"===t&&(!qe||!Be)||"split"===t&&!Le){var u=/./[o],f=n(o,""[t],(function(t,e,n,r,o){return e.exec===De?a&&!o?{done:!0,value:u.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:Be}),l=f[0],s=f[1];nt(String.prototype,t,l),nt(RegExp.prototype,o,2==e?function(t,e){return s.call(t,this,e)}:function(t){return s.call(t,this)})}r&&I(RegExp.prototype[o],"sham",!0)}("replace",2,(function(t,e,n,r){return[function(n,r){var o=v(this),i=null==n?void 0:n[t];return void 0!==i?i.call(n,o,r):e.call(String(o),n,r)},function(t,i){if(r.REPLACE_KEEPS_$0||"string"==typeof i&&-1===i.indexOf("$0")){var a=n(e,t,this,i);if(a.done)return a.value}var c=P(t),u=String(this),f="function"==typeof i;f||(i=String(i));var l=c.global;if(l){var s=c.unicode;c.lastIndex=0}for(var d=[];;){var p=We(c,u);if(null===p)break;if(d.push(p),!l)break;""===String(p[0])&&(c.lastIndex=Ue(u,lt(c.lastIndex),s))}for(var h,v="",y=0,g=0;g<d.length;g++){p=d[g];for(var b=String(p[0]),m=ze(Ye(ut(p.index),u.length),0),x=[],O=1;O<p.length;O++)x.push(void 0===(h=p[O])?h:String(h));var w=p.groups;if(f){var E=[b].concat(x,m,u);void 0!==w&&E.push(w);var j=String(i.apply(void 0,E))}else j=o(b,u,m,x,w,i);m>=y&&(v+=u.slice(y,m)+j,y=m+b.length)}return v+u.slice(y)}];function o(t,n,r,o,i,a){var c=r+t.length,u=o.length,f=Qe;return void 0!==i&&(i=kt(i),f=He),e.call(a,f,(function(e,a){var f;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(c);case"<":f=i[a.slice(1,-1)];break;default:var l=+a;if(0===l)return e;if(l>u){var s=Ge(l/10);return 0===s?e:s<=u?void 0===o[s-1]?a.charAt(1):o[s-1]+a.charAt(1):e}f=o[l-1]}return void 0===f?"":f}))}}));var nn=t.fn.bootstrapTable.utils;t.extend(t.fn.bootstrapTable.defaults,{editable:!0,onEditableInit:function(){return!1},onEditableSave:function(t,e,n,r,o){return!1},onEditableShown:function(t,e,n,r){return!1},onEditableHidden:function(t,e,n,r){return!1}}),t.extend(t.fn.bootstrapTable.Constructor.EVENTS,{"editable-init.bs.table":"onEditableInit","editable-save.bs.table":"onEditableSave","editable-shown.bs.table":"onEditableShown","editable-hidden.bs.table":"onEditableHidden"}),t.BootstrapTable=function(e){function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),tn(this,Ze(n).apply(this,arguments))}var r,o,i;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Je(t,e)}(n,e),r=n,(o=[{key:"initTable",value:function(){var e=this;en(Ze(n.prototype),"initTable",this).call(this),this.options.editable&&(this.editedCells=[],t.each(this.columns,(function(n,r){if(r.editable){var o={},i=[],a=function(t,e){var n=t.replace(/([A-Z])/g,(function(t){return"-".concat(t.toLowerCase())}));0===n.indexOf("editable-")&&(o[n.replace("editable-","data-")]=e)};t.each(e.options,a),r.formatter=r.formatter||function(t){return t},r._formatter=r._formatter?r._formatter:r.formatter,r.formatter=function(n,c,u){var f=nn.calculateObjectValue(r,r._formatter,[n,c,u],n);if(f=null==f?e.options.undefinedText:f,void 0!==e.options.uniqueId){var l=nn.getItemField(c,e.options.uniqueId,!1);-1!==t.inArray(r.field+l,e.editedCells)&&(f=n)}t.each(r,a),t.each(o,(function(t,e){i.push(" ".concat(t,'="').concat(e,'"'))}));var s=!1;return r.editable.hasOwnProperty("noeditFormatter")&&(s=r.editable.noeditFormatter(n,c,u)),!1===s?'<a href="javascript:void(0)"\n            data-name="'.concat(r.field,'"\n            data-pk="').concat(c[e.options.idField],'"\n            data-value="').concat(f,'"\n            ').concat(i.join(""),"></a>"):s}}})))}},{key:"initBody",value:function(e){var r=this;en(Ze(n.prototype),"initBody",this).call(this,e),this.options.editable&&(t.each(this.columns,(function(e,n){if(n.editable){var o=r.getData(),i=r.$body.find('a[data-name="'.concat(n.field,'"]'));i.each((function(e,r){var i=t(r),a=i.closest("tr").data("index"),c=o[a],u=nn.calculateObjectValue(n,n.editable,[a,c,i],{});i.editable(u)})),i.off("save").on("save",(function(e,o){var i=e.currentTarget,a=o.submitValue,c=t(i),u=r.getData(),f=c.parents("tr[data-index]").data("index"),l=u[f],s=l[n.field];if(void 0!==r.options.uniqueId){var d=nn.getItemField(l,r.options.uniqueId,!1);-1===t.inArray(n.field+d,r.editedCells)&&r.editedCells.push(n.field+d)}c.data("value",a),l[n.field]=a,r.trigger("editable-save",n.field,l,f,s,c),r.initBody()})),i.off("shown").on("shown",(function(e,o){var i=e.currentTarget,a=t(i),c=r.getData()[a.parents("tr[data-index]").data("index")];r.trigger("editable-shown",n.field,c,a,o)})),i.off("hidden").on("hidden",(function(e,o){var i=e.currentTarget,a=t(i),c=r.getData()[a.parents("tr[data-index]").data("index")];r.trigger("editable-hidden",n.field,c,a,o)}))}})),this.trigger("editable-init"))}}])&&Xe(r.prototype,o),i&&Xe(r,i),n}(t.BootstrapTable)}));
diff --git a/cps/static/js/libs/bootstrap-table/bootstrap-table.min.js b/cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
index ae407d4c..e37e1a7e 100644
--- a/cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
+++ b/cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
@@ -1,9 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";var b=3;try{b=parseInt(a.fn.dropdown.Constructor.VERSION,10)}catch(c){}var d={3:{buttonsClass:"default",iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggleOff:"glyphicon-list-alt icon-list-alt",toggleOn:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus",fullscreen:"glyphicon-fullscreen"},pullClass:"pull",toobarDropdowHtml:['<ul class="dropdown-menu" role="menu">',"</ul>"],toobarDropdowItemHtml:'<li role="menuitem"><label>%s</label></li>',pageDropdownHtml:['<ul class="dropdown-menu" role="menu">',"</ul>"],pageDropdownItemHtml:'<li role="menuitem" class="%s"><a href="#">%s</a></li>'},4:{buttonsClass:"secondary",iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-toggle-down",paginationSwitchUp:"fa-toggle-up",refresh:"fa-refresh",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt"},pullClass:"float",toobarDropdowHtml:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toobarDropdowItemHtml:'<label class="dropdown-item">%s</label>',pageDropdownHtml:['<div class="dropdown-menu">',"</div>"],pageDropdownItemHtml:'<a class="dropdown-item %s" href="#">%s</a>'}}[b],e=null,f=function(a){var b=arguments,c=!0,d=1;return a=a.replace(/%s/g,function(){var a=b[d++];return"undefined"==typeof a?(c=!1,""):a}),c?a:""},g=function(b,c,d,e){var f="";return a.each(b,function(a,b){return b[c]===e?(f=b[d],!1):!0}),f},h=function(b){var c,d,e,f=0,g=[];for(c=0;c<b[0].length;c++)f+=b[0][c].colspan||1;for(c=0;c<b.length;c++)for(g[c]=[],d=0;f>d;d++)g[c][d]=!1;for(c=0;c<b.length;c++)for(d=0;d<b[c].length;d++){var h=b[c][d],i=h.rowspan||1,j=h.colspan||1,k=a.inArray(!1,g[c]);for(1===j&&(h.fieldIndex=k,"undefined"==typeof h.field&&(h.field=k)),e=0;i>e;e++)g[c+e][k]=!0;for(e=0;j>e;e++)g[c][k+e]=!0}},i=function(){if(null===e){var b,c,d=a("<p/>").addClass("fixed-table-scroll-inner"),f=a("<div/>").addClass("fixed-table-scroll-outer");f.append(d),a("body").append(f),b=d[0].offsetWidth,f.css("overflow","scroll"),c=d[0].offsetWidth,b===c&&(c=f[0].clientWidth),f.remove(),e=b-c}return e},j=function(b,c,d,e){var g=c;if("string"==typeof c){var h=c.split(".");h.length>1?(g=window,a.each(h,function(a,b){g=g[b]})):g=window[c]}return"object"==typeof g?g:"function"==typeof g?g.apply(b,d||[]):!g&&"string"==typeof c&&f.apply(this,[c].concat(d))?f.apply(this,[c].concat(d)):e},k=function(b,c,d){var e=Object.getOwnPropertyNames||function(a){var b=[];for(var c in a)a.hasOwnProperty(c)&&b.push(c);return b},f=e(b),g=e(c),h="";if(d&&f.length!==g.length)return!1;for(var i=0;i<f.length;i++)if(h=f[i],a.inArray(h,g)>-1&&b[h]!==c[h])return!1;return!0},l=function(a){return"string"==typeof a?a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#039;").replace(/`/g,"&#x60;"):a},m=function(a){for(var b in a){var c=b.split(/(?=[A-Z])/).join("-").toLowerCase();c!==b&&(a[c]=a[b],delete a[b])}return a},n=function(a,b,c){var d=a;if("string"!=typeof b||a.hasOwnProperty(b))return c?l(a[b]):a[b];var e=b.split(".");for(var f in e)e.hasOwnProperty(f)&&(d=d&&d[e[f]]);return c?l(d):d},o=function(){return!!(navigator.userAgent.indexOf("MSIE ")>0||navigator.userAgent.match(/Trident.*rv\:11\./))},p=function(){Object.keys||(Object.keys=function(){var a=Object.prototype.hasOwnProperty,b=!{toString:null}.propertyIsEnumerable("toString"),c=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],d=c.length;return function(e){if("object"!=typeof e&&("function"!=typeof e||null===e))throw new TypeError("Object.keys called on non-object");var f,g,h=[];for(f in e)a.call(e,f)&&h.push(f);if(b)for(g=0;d>g;g++)a.call(e,c[g])&&h.push(c[g]);return h}}())},q=function(b,c){this.options=c,this.$el=a(b),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0,this.init()};q.DEFAULTS={classes:"table table-hover",sortClass:void 0,locale:void 0,height:void 0,undefinedText:"-",sortName:void 0,sortOrder:"asc",sortStable:!1,rememberOrder:!1,striped:!1,columns:[[]],data:[],totalField:"total",dataField:"rows",method:"get",url:void 0,ajax:void 0,cache:!0,contentType:"application/json",dataType:"json",ajaxOptions:{},queryParams:function(a){return a},queryParamsType:"limit",responseHandler:function(a){return a},pagination:!1,onlyInfoPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"&lsaquo;",paginationNextText:"&rsaquo;",search:!1,searchOnEnterKey:!1,strictSearch:!1,searchAlign:"right",selectItemName:"btSelectItem",showHeader:!0,showFooter:!1,showColumns:!1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,showFullscreen:!1,smartDisplay:!0,escape:!1,minimumCountColumns:1,idField:void 0,uniqueId:void 0,cardView:!1,detailView:!1,detailFormatter:function(){return""},detailFilter:function(){return!0},trimOnSearch:!0,clickToSelect:!1,singleSelect:!1,toolbar:void 0,toolbarAlign:"left",buttonsToolbar:void 0,buttonsAlign:"right",checkboxHeader:!0,sortable:!0,silentSort:!0,maintainSelected:!1,searchTimeOut:500,searchText:"",iconSize:void 0,buttonsClass:d.buttonsClass,iconsPrefix:d.iconsPrefix,icons:d.icons,customSearch:a.noop,customSort:a.noop,ignoreClickToSelectOn:function(b){return a.inArray(b.tagName,["A","BUTTON"])},rowStyle:function(){return{}},rowAttributes:function(){return{}},footerStyle:function(){return{}},onAll:function(){return!1},onClickCell:function(){return!1},onDblClickCell:function(){return!1},onClickRow:function(){return!1},onDblClickRow:function(){return!1},onSort:function(){return!1},onCheck:function(){return!1},onUncheck:function(){return!1},onCheckAll:function(){return!1},onUncheckAll:function(){return!1},onCheckSome:function(){return!1},onUncheckSome:function(){return!1},onLoadSuccess:function(){return!1},onLoadError:function(){return!1},onColumnSwitch:function(){return!1},onPageChange:function(){return!1},onSearch:function(){return!1},onToggle:function(){return!1},onPreBody:function(){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onExpandRow:function(){return!1},onCollapseRow:function(){return!1},onRefreshOptions:function(){return!1},onRefresh:function(){return!1},onResetView:function(){return!1},onScrollBody:function(){return!1}},q.LOCALES={},q.LOCALES["en-US"]=q.LOCALES.en={formatLoadingMessage:function(){return"Loading, please wait..."},formatRecordsPerPage:function(a){return f("%s rows per page",a)},formatShowingRows:function(a,b,c){return f("Showing %s to %s of %s rows",a,b,c)},formatDetailPagination:function(a){return f("Showing %s rows",a)},formatSearch:function(){return"Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatFullscreen:function(){return"Fullscreen"},formatColumns:function(){return"Columns"},formatAllRows:function(){return"All"}},a.extend(q.DEFAULTS,q.LOCALES["en-US"]),q.COLUMN_DEFAULTS={radio:!1,checkbox:!1,checkboxEnabled:!0,field:void 0,title:void 0,titleTooltip:void 0,"class":void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,width:void 0,sortable:!1,order:"asc",visible:!0,switchable:!0,clickToSelect:!0,formatter:void 0,footerFormatter:void 0,events:void 0,sorter:void 0,sortName:void 0,cellStyle:void 0,searchable:!0,searchFormatter:!0,cardVisible:!0,escape:!1,showSelectTitle:!1},q.EVENTS={"all.bs.table":"onAll","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh","scroll-body.bs.table":"onScrollBody"},q.prototype.init=function(){this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initFooter(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()},q.prototype.initLocale=function(){if(this.options.locale){var b=this.options.locale.split(/-|_/);b[0].toLowerCase(),b[1]&&b[1].toUpperCase(),a.fn.bootstrapTable.locales[this.options.locale]?a.extend(this.options,a.fn.bootstrapTable.locales[this.options.locale]):a.fn.bootstrapTable.locales[b.join("-")]?a.extend(this.options,a.fn.bootstrapTable.locales[b.join("-")]):a.fn.bootstrapTable.locales[b[0]]&&a.extend(this.options,a.fn.bootstrapTable.locales[b[0]])}},q.prototype.initContainer=function(){this.$container=a(['<div class="bootstrap-table">','<div class="fixed-table-toolbar"></div>',"top"===this.options.paginationVAlign||"both"===this.options.paginationVAlign?'<div class="fixed-table-pagination" style="clear: both;"></div>':"",'<div class="fixed-table-container">','<div class="fixed-table-header"><table></table></div>','<div class="fixed-table-body">','<div class="fixed-table-loading">',this.options.formatLoadingMessage(),"</div>","</div>",'<div class="fixed-table-footer"><table><tr></tr></table></div>',"</div>","bottom"===this.options.paginationVAlign||"both"===this.options.paginationVAlign?'<div class="fixed-table-pagination"></div>':"","</div>"].join("")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$container.find(".fixed-table-footer"),this.$toolbar=this.options.buttonsToolbar?a("body").find(this.options.buttonsToolbar):this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.options.striped&&this.$el.addClass("table-striped"),-1!==a.inArray("table-no-bordered",this.options.classes.split(" "))&&this.$tableContainer.addClass("table-no-bordered")},q.prototype.initTable=function(){var b=this,c=[],d=[];if(this.$header=this.$el.find(">thead"),this.$header.length||(this.$header=a("<thead></thead>").appendTo(this.$el)),this.$header.find("tr").each(function(){var b=[];a(this).find("th").each(function(){"undefined"!=typeof a(this).data("field")&&a(this).data("field",a(this).data("field")+""),b.push(a.extend({},{title:a(this).html(),"class":a(this).attr("class"),titleTooltip:a(this).attr("title"),rowspan:a(this).attr("rowspan")?+a(this).attr("rowspan"):void 0,colspan:a(this).attr("colspan")?+a(this).attr("colspan"):void 0},a(this).data()))}),c.push(b)}),a.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=a.extend(!0,[],c,this.options.columns),this.columns=[],this.fieldsColumnsIndex=[],h(this.options.columns),a.each(this.options.columns,function(c,d){a.each(d,function(d,e){e=a.extend({},q.COLUMN_DEFAULTS,e),"undefined"!=typeof e.fieldIndex&&(b.columns[e.fieldIndex]=e,b.fieldsColumnsIndex[e.field]=e.fieldIndex),b.options.columns[c][d]=e})}),!this.options.data.length){var e=[];this.$el.find(">tbody>tr").each(function(c){var f={};f._id=a(this).attr("id"),f._class=a(this).attr("class"),f._data=m(a(this).data()),a(this).find(">td").each(function(d){for(var g,h,i=a(this),j=+i.attr("colspan")||1,k=+i.attr("rowspan")||1;e[c]&&e[c][d];d++);for(g=d;d+j>g;g++)for(h=c;c+k>h;h++)e[h]||(e[h]=[]),e[h][g]=!0;var l=b.columns[d].field;f[l]=a(this).html(),f["_"+l+"_id"]=a(this).attr("id"),f["_"+l+"_class"]=a(this).attr("class"),f["_"+l+"_rowspan"]=a(this).attr("rowspan"),f["_"+l+"_colspan"]=a(this).attr("colspan"),f["_"+l+"_title"]=a(this).attr("title"),f["_"+l+"_data"]=m(a(this).data())}),d.push(f)}),this.options.data=d,d.length&&(this.fromHtml=!0)}},q.prototype.initHeader=function(){var b=this,c={},d=[];this.header={fields:[],styles:[],classes:[],formatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},a.each(this.options.columns,function(e,g){d.push("<tr>"),0===e&&!b.options.cardView&&b.options.detailView&&d.push(f('<th class="detail" rowspan="%s"><div class="fht-cell"></div></th>',b.options.columns.length)),a.each(g,function(a,e){var g="",h="",i="",j="",k=f(' class="%s"',e["class"]),m=(b.options.sortOrder||e.order,"px"),n=e.width;if(void 0===e.width||b.options.cardView||"string"==typeof e.width&&-1!==e.width.indexOf("%")&&(m="%"),e.width&&"string"==typeof e.width&&(n=e.width.replace("%","").replace("px","")),h=f("text-align: %s; ",e.halign?e.halign:e.align),i=f("text-align: %s; ",e.align),j=f("vertical-align: %s; ",e.valign),j+=f("width: %s; ",!e.checkbox&&!e.radio||n?n?n+m:void 0:e.showSelectTitle?void 0:"36px"),"undefined"!=typeof e.fieldIndex){if(b.header.fields[e.fieldIndex]=e.field,b.header.styles[e.fieldIndex]=i+j,b.header.classes[e.fieldIndex]=k,b.header.formatters[e.fieldIndex]=e.formatter,b.header.events[e.fieldIndex]=e.events,b.header.sorters[e.fieldIndex]=e.sorter,b.header.sortNames[e.fieldIndex]=e.sortName,b.header.cellStyles[e.fieldIndex]=e.cellStyle,b.header.searchables[e.fieldIndex]=e.searchable,!e.visible)return;if(b.options.cardView&&!e.cardVisible)return;c[e.field]=e}d.push("<th"+f(' title="%s"',e.titleTooltip),e.checkbox||e.radio?f(' class="bs-checkbox %s"',e["class"]||""):k,f(' style="%s"',h+j),f(' rowspan="%s"',e.rowspan),f(' colspan="%s"',e.colspan),f(' data-field="%s"',e.field),0===a&&e.fieldIndex?" data-not-first-th":"",">"),d.push(f('<div class="th-inner %s">',b.options.sortable&&e.sortable?"sortable both":"")),g=b.options.escape?l(e.title):e.title;var o=g;e.checkbox&&(g="",!b.options.singleSelect&&b.options.checkboxHeader&&(g='<input name="btSelectAll" type="checkbox" />'),b.header.stateField=e.field),e.radio&&(g="",b.header.stateField=e.field,b.options.singleSelect=!0),!g&&e.showSelectTitle&&(g+=o),d.push(g),d.push("</div>"),d.push('<div class="fht-cell"></div>'),d.push("</div>"),d.push("</th>")}),d.push("</tr>")}),this.$header.html(d.join("")),this.$header.find("th[data-field]").each(function(){a(this).data(c[a(this).data("field")])}),this.$container.off("click",".th-inner").on("click",".th-inner",function(c){var d=a(this);return b.options.detailView&&!d.parent().hasClass("bs-checkbox")&&d.closest(".bootstrap-table")[0]!==b.$container[0]?!1:void(b.options.sortable&&d.parent().data().sortable&&b.onSort(c))}),this.$header.children().children().off("keypress").on("keypress",function(c){if(b.options.sortable&&a(this).data().sortable){var d=c.keyCode||c.which;13==d&&b.onSort(c)}}),a(window).off("resize.bootstrap-table"),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),a(window).on("resize.bootstrap-table",a.proxy(this.resetWidth,this))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",function(){var c=a(this).prop("checked");b[c?"checkAll":"uncheckAll"](),b.updateSelected()})},q.prototype.initFooter=function(){!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()},q.prototype.initData=function(a,b){this.options.data="append"===b?this.options.data.concat(a):"prepend"===b?[].concat(a).concat(this.options.data):a||this.options.data,this.data=this.options.data,"server"!==this.options.sidePagination&&this.initSort()},q.prototype.initSort=function(){var b=this,c=this.options.sortName,d="desc"===this.options.sortOrder?-1:1,e=a.inArray(this.options.sortName,this.header.fields),g=0;return this.options.customSort!==a.noop?void this.options.customSort.apply(this,[this.options.sortName,this.options.sortOrder]):void(-1!==e&&(this.options.sortStable&&a.each(this.data,function(a,b){b._position=a}),this.data.sort(function(f,g){b.header.sortNames[e]&&(c=b.header.sortNames[e]);var h=n(f,c,b.options.escape),i=n(g,c,b.options.escape),k=j(b.header,b.header.sorters[e],[h,i,f,g]);return void 0!==k?b.options.sortStable&&0===k?f._position-g._position:d*k:((void 0===h||null===h)&&(h=""),(void 0===i||null===i)&&(i=""),b.options.sortStable&&h===i?(h=f._position,i=g._position,f._position-g._position):a.isNumeric(h)&&a.isNumeric(i)?(h=parseFloat(h),i=parseFloat(i),i>h?-1*d:d):h===i?0:("string"!=typeof h&&(h=h.toString()),-1===h.localeCompare(i)?-1*d:d))}),void 0!==this.options.sortClass&&(clearTimeout(g),g=setTimeout(function(){b.$el.removeClass(b.options.sortClass);var a=b.$header.find(f('[data-field="%s"]',b.options.sortName).index()+1);b.$el.find(f("tr td:nth-child(%s)",a)).addClass(b.options.sortClass)},250))))},q.prototype.onSort=function(b){var c="keypress"===b.type?a(b.currentTarget):a(b.currentTarget).parent(),d=this.$header.find("th").eq(c.index());return this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===c.data("field")?this.options.sortOrder="asc"===this.options.sortOrder?"desc":"asc":(this.options.sortName=c.data("field"),this.options.sortOrder=this.options.rememberOrder?"asc"===c.data("order")?"desc":"asc":this.columns[this.fieldsColumnsIndex[c.data("field")]].order),this.trigger("sort",this.options.sortName,this.options.sortOrder),c.add(d).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination?void this.initServer(this.options.silentSort):(this.initSort(),void this.initBody())},q.prototype.initToolbar=function(){var b,c,e=this,g=[],h=0,i=0;this.$toolbar.find(".bs-bars").children().length&&a("body").append(a(this.options.toolbar)),this.$toolbar.html(""),("string"==typeof this.options.toolbar||"object"==typeof this.options.toolbar)&&a(f('<div class="bs-bars %s-%s"></div>',d.pullClass,this.options.toolbarAlign)).appendTo(this.$toolbar).append(a(this.options.toolbar)),g=[f('<div class="columns columns-%s btn-group %s-%s">',this.options.buttonsAlign,d.pullClass,this.options.buttonsAlign)],"string"==typeof this.options.icons&&(this.options.icons=j(null,this.options.icons)),this.options.showPaginationSwitch&&g.push(f('<button class="btn'+f(" btn-%s",this.options.buttonsClass)+f(" btn-%s",this.options.iconSize)+'" type="button" name="paginationSwitch" aria-label="pagination Switch" title="%s">',this.options.formatPaginationSwitch()),f('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.paginationSwitchDown),"</button>"),this.options.showFullscreen&&this.$toolbar.find('button[name="fullscreen"]').off("click").on("click",a.proxy(this.toggleFullscreen,this)),this.options.showRefresh&&g.push(f('<button class="btn'+f(" btn-%s",this.options.buttonsClass)+f(" btn-%s",this.options.iconSize)+'" type="button" name="refresh" aria-label="refresh" title="%s">',this.options.formatRefresh()),f('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.refresh),"</button>"),this.options.showToggle&&g.push(f('<button class="btn'+f(" btn-%s",this.options.buttonsClass)+f(" btn-%s",this.options.iconSize)+'" type="button" name="toggle" aria-label="toggle" title="%s">',this.options.formatToggle()),f('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.toggle),"</button>"),this.options.showFullscreen&&g.push(f('<button class="btn'+f(" btn-%s",this.options.buttonsClass)+f(" btn-%s",this.options.iconSize)+'" type="button" name="fullscreen" aria-label="fullscreen" title="%s">',this.options.formatFullscreen()),f('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.fullscreen),"</button>"),this.options.showColumns&&(g.push(f('<div class="keep-open btn-group" title="%s">',this.options.formatColumns()),'<button type="button" aria-label="columns" class="btn'+f(" btn-%s",this.options.buttonsClass)+f(" btn-%s",this.options.iconSize)+' dropdown-toggle" data-toggle="dropdown">',f('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.columns),' <span class="caret"></span>',"</button>",d.toobarDropdowHtml[0]),a.each(this.columns,function(a,b){if(!(b.radio||b.checkbox||e.options.cardView&&!b.cardVisible)){var c=b.visible?' checked="checked"':"";b.switchable&&(g.push(f(d.toobarDropdowItemHtml,f('<input type="checkbox" data-field="%s" value="%s"%s> %s',b.field,a,c,b.title))),i++)}}),g.push(d.toobarDropdowHtml[1],"</div>")),g.push("</div>"),(this.showToolbar||g.length>2)&&this.$toolbar.append(g.join("")),this.options.showPaginationSwitch&&this.$toolbar.find('button[name="paginationSwitch"]').off("click").on("click",a.proxy(this.togglePagination,this)),this.options.showRefresh&&this.$toolbar.find('button[name="refresh"]').off("click").on("click",a.proxy(this.refresh,this)),this.options.showToggle&&this.$toolbar.find('button[name="toggle"]').off("click").on("click",function(){e.toggleView()}),this.options.showColumns&&(b=this.$toolbar.find(".keep-open"),i<=this.options.minimumCountColumns&&b.find("input").prop("disabled",!0),b.find("li").off("click").on("click",function(a){a.stopImmediatePropagation()}),b.find("input").off("click").on("click",function(){var b=a(this);e.toggleColumn(a(this).val(),b.prop("checked"),!1),e.trigger("column-switch",a(this).data("field"),b.prop("checked"))})),this.options.search&&(g=[],g.push(f('<div class="%s-%s search">',d.pullClass,this.options.searchAlign),f('<input class="form-control'+f(" input-%s",this.options.iconSize)+'" type="text" placeholder="%s">',this.options.formatSearch()),"</div>"),this.$toolbar.append(g.join("")),c=this.$toolbar.find(".search input"),c.off("keyup drop blur").on("keyup drop blur",function(b){e.options.searchOnEnterKey&&13!==b.keyCode||a.inArray(b.keyCode,[37,38,39,40])>-1||(clearTimeout(h),h=setTimeout(function(){e.onSearch(b)},e.options.searchTimeOut))}),o()&&c.off("mouseup").on("mouseup",function(a){clearTimeout(h),h=setTimeout(function(){e.onSearch(a)},e.options.searchTimeOut)}))},q.prototype.onSearch=function(b){var c=a.trim(a(b.currentTarget).val());this.options.trimOnSearch&&a(b.currentTarget).val()!==c&&a(b.currentTarget).val(c),c!==this.searchText&&(this.searchText=c,this.options.searchText=c,this.options.pageNumber=1,this.initSearch(),b.firedByInitSearchText?"client"===this.options.sidePagination&&this.updatePagination():this.updatePagination(),this.trigger("search",c))},q.prototype.initSearch=function(){var b=this;if("server"!==this.options.sidePagination){if(this.options.customSearch!==a.noop)return void window[this.options.customSearch].apply(this,[this.searchText]);var c=this.searchText&&(this.options.escape?l(this.searchText):this.searchText).toLowerCase(),d=a.isEmptyObject(this.filterColumns)?null:this.filterColumns;this.data=d?a.grep(this.options.data,function(b){for(var c in d)if(a.isArray(d[c])&&-1===a.inArray(b[c],d[c])||!a.isArray(d[c])&&b[c]!==d[c])return!1;return!0}):this.options.data,this.data=c?a.grep(this.data,function(d,e){for(var f=0;f<b.header.fields.length;f++)if(b.header.searchables[f]){var g,h=a.isNumeric(b.header.fields[f])?parseInt(b.header.fields[f],10):b.header.fields[f],i=b.columns[b.fieldsColumnsIndex[h]];if("string"==typeof h){g=d;for(var k=h.split("."),l=0;l<k.length;l++)null!=g[k[l]]&&(g=g[k[l]]);i&&i.searchFormatter&&(g=j(i,b.header.formatters[f],[g,d,e],g))}else g=d[h];if("string"==typeof g||"number"==typeof g)if(b.options.strictSearch){if((g+"").toLowerCase()===c)return!0}else if(-1!==(g+"").toLowerCase().indexOf(c))return!0}return!1}):this.data}},q.prototype.initPagination=function(){if(!this.options.pagination)return void this.$pagination.hide();this.$pagination.show();var b,c,e,g,h,i,j,k=this,l=[],m=!1,n=this.getData(),o=this.options.pageList;if("server"!==this.options.sidePagination&&(this.options.totalRows=n.length),this.totalPages=0,this.options.totalRows){if(this.options.pageSize===this.options.formatAllRows())this.options.pageSize=this.options.totalRows,m=!0;else if(this.options.pageSize===this.options.totalRows){var p="string"==typeof this.options.pageList?this.options.pageList.replace("[","").replace("]","").replace(/ /g,"").toLowerCase().split(","):this.options.pageList;a.inArray(this.options.formatAllRows().toLowerCase(),p)>-1&&(m=!0)}this.totalPages=~~((this.options.totalRows-1)/this.options.pageSize)+1,this.options.totalPages=this.totalPages}if(this.totalPages>0&&this.options.pageNumber>this.totalPages&&(this.options.pageNumber=this.totalPages),this.pageFrom=(this.options.pageNumber-1)*this.options.pageSize+1,this.pageTo=this.options.pageNumber*this.options.pageSize,this.pageTo>this.options.totalRows&&(this.pageTo=this.options.totalRows),l.push(f('<div class="%s-%s pagination-detail">',d.pullClass,this.options.paginationDetailHAlign),'<span class="pagination-info">',this.options.onlyInfoPagination?this.options.formatDetailPagination(this.options.totalRows):this.options.formatShowingRows(this.pageFrom,this.pageTo,this.options.totalRows),"</span>"),!this.options.onlyInfoPagination){l.push('<span class="page-list">');var q=[f('<span class="btn-group %s">',"top"===this.options.paginationVAlign||"both"===this.options.paginationVAlign?"dropdown":"dropup"),'<button type="button" class="btn'+f(" btn-%s",this.options.buttonsClass)+f(" btn-%s",this.options.iconSize)+' dropdown-toggle" data-toggle="dropdown">','<span class="page-size">',m?this.options.formatAllRows():this.options.pageSize,"</span>",' <span class="caret"></span>',"</button>",d.pageDropdownHtml[0]];if("string"==typeof this.options.pageList){var r=this.options.pageList.replace("[","").replace("]","").replace(/ /g,"").split(",");o=[],a.each(r,function(a,b){o.push(b.toUpperCase()===k.options.formatAllRows().toUpperCase()||"UNLIMITED"===b.toUpperCase()?k.options.formatAllRows():+b)})}for(a.each(o,function(a,b){if(!k.options.smartDisplay||0===a||o[a-1]<k.options.totalRows){var c;c=m?b===k.options.formatAllRows()?"active":"":b===k.options.pageSize?"active":"",q.push(f(d.pageDropdownItemHtml,c,b))}}),q.push(d.pageDropdownHtml[1]+"</span>"),l.push(this.options.formatRecordsPerPage(q.join(""))),l.push("</span>"),l.push("</div>",f('<div class="%s-%s pagination">',d.pullClass,this.options.paginationHAlign),'<ul class="pagination'+f(" pagination-%s",this.options.iconSize)+'">',f('<li class="page-item page-pre"><a class="page-link" href="#">%s</a></li>',this.options.paginationPreText)),this.totalPages<5?(c=1,e=this.totalPages):(c=this.options.pageNumber-2,e=c+4,1>c&&(c=1,e=5),e>this.totalPages&&(e=this.totalPages,c=e-4)),this.totalPages>=6&&(this.options.pageNumber>=3&&(l.push(f('<li class="page-item page-first%s">',1===this.options.pageNumber?" active":""),'<a class="page-link" href="#">',1,"</a>","</li>"),c++),this.options.pageNumber>=4&&(4==this.options.pageNumber||6==this.totalPages||7==this.totalPages?c--:l.push('<li class="page-item page-first-separator disabled">','<a class="page-link" href="#">...</a>',"</li>"),e--)),this.totalPages>=7&&this.options.pageNumber>=this.totalPages-2&&c--,6==this.totalPages?this.options.pageNumber>=this.totalPages-2&&e++:this.totalPages>=7&&(7==this.totalPages||this.options.pageNumber>=this.totalPages-3)&&e++,b=c;e>=b;b++)l.push(f('<li class="page-item%s">',b===this.options.pageNumber?" active":""),'<a class="page-link" href="#">',b,"</a>","</li>");this.totalPages>=8&&this.options.pageNumber<=this.totalPages-4&&l.push('<li class="page-item page-last-separator disabled">','<a class="page-link" href="#">...</a>',"</li>"),this.totalPages>=6&&this.options.pageNumber<=this.totalPages-3&&l.push(f('<li class="page-item page-last%s">',this.totalPages===this.options.pageNumber?" active":""),'<a class="page-link" href="#">',this.totalPages,"</a>","</li>"),l.push(f('<li class="page-item page-next"><a class="page-link" href="#">%s</a></li>',this.options.paginationNextText),"</ul>","</div>")}this.$pagination.html(l.join("")),this.options.onlyInfoPagination||(g=this.$pagination.find(".page-list a"),h=this.$pagination.find(".page-pre"),i=this.$pagination.find(".page-next"),j=this.$pagination.find(".page-item").not(".page-next, .page-pre"),this.options.smartDisplay&&(this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),(o.length<2||this.options.totalRows<=o[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"]()),this.options.paginationLoop||(1===this.options.pageNumber&&h.addClass("disabled"),this.options.pageNumber===this.totalPages&&i.addClass("disabled")),m&&(this.options.pageSize=this.options.formatAllRows()),g.off("click").on("click",a.proxy(this.onPageListChange,this)),h.off("click").on("click",a.proxy(this.onPagePre,this)),i.off("click").on("click",a.proxy(this.onPageNext,this)),j.off("click").on("click",a.proxy(this.onPageNumber,this)))},q.prototype.updatePagination=function(b){b&&a(b.currentTarget).hasClass("disabled")||(this.options.maintainSelected||this.resetRows(),this.initPagination(),"server"===this.options.sidePagination?this.initServer():this.initBody(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize))},q.prototype.onPageListChange=function(b){b.preventDefault();var c=a(b.currentTarget);return c.parent().addClass("active").siblings().removeClass("active"),this.options.pageSize=c.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+c.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(b),!1},q.prototype.onPagePre=function(a){return a.preventDefault(),this.options.pageNumber-1===0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(a),!1},q.prototype.onPageNext=function(a){return a.preventDefault(),this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(a),!1},q.prototype.onPageNumber=function(b){return b.preventDefault(),this.options.pageNumber!==+a(b.currentTarget).text()?(this.options.pageNumber=+a(b.currentTarget).text(),this.updatePagination(b),!1):void 0},q.prototype.initRow=function(b,c){var d,e=this,h=[],i={},k=[],m="",o={},p=[];if(!(a.inArray(b,this.hiddenRows)>-1)){if(i=j(this.options,this.options.rowStyle,[b,c],i),i&&i.css)for(d in i.css)k.push(d+": "+i.css[d]);if(o=j(this.options,this.options.rowAttributes,[b,c],o))for(d in o)p.push(f('%s="%s"',d,l(o[d])));return b._data&&!a.isEmptyObject(b._data)&&a.each(b._data,function(a,b){"index"!==a&&(m+=f(' data-%s="%s"',a,b))}),h.push("<tr",f(" %s",p.join(" ")),f(' id="%s"',a.isArray(b)?void 0:b._id),f(' class="%s"',i.classes||(a.isArray(b)?void 0:b._class)),f(' data-index="%s"',c),f(' data-uniqueid="%s"',b[this.options.uniqueId]),f("%s",m),">"),this.options.cardView&&h.push(f('<td colspan="%s"><div class="card-views">',this.header.fields.length)),!this.options.cardView&&this.options.detailView&&(h.push("<td>"),j(null,this.options.detailFilter,[c,b])&&h.push('<a class="detail-icon" href="#">',f('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.detailOpen),"</a>"),h.push("</td>")),a.each(this.header.fields,function(d,m){var o="",p=n(b,m,e.options.escape),q="",r="",s={},t="",u=e.header.classes[d],v="",w="",x="",y="",z=e.columns[d];
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
 
-if((!e.fromHtml||"undefined"!=typeof p||z.checkbox||z.radio)&&z.visible&&(!e.options.cardView||z.cardVisible)){if(z.escape&&(p=l(p)),i=f('style="%s"',k.concat(e.header.styles[d]).join("; ")),b["_"+m+"_id"]&&(t=f(' id="%s"',b["_"+m+"_id"])),b["_"+m+"_class"]&&(u=f(' class="%s"',b["_"+m+"_class"])),b["_"+m+"_rowspan"]&&(w=f(' rowspan="%s"',b["_"+m+"_rowspan"])),b["_"+m+"_colspan"]&&(x=f(' colspan="%s"',b["_"+m+"_colspan"])),b["_"+m+"_title"]&&(y=f(' title="%s"',b["_"+m+"_title"])),s=j(e.header,e.header.cellStyles[d],[p,b,c,m],s),s.classes&&(u=f(' class="%s"',s.classes)),s.css){var A=[];for(var B in s.css)A.push(B+": "+s.css[B]);i=f('style="%s"',A.concat(e.header.styles[d]).join("; "))}q=j(z,e.header.formatters[d],[p,b,c,m],p),b["_"+m+"_data"]&&!a.isEmptyObject(b["_"+m+"_data"])&&a.each(b["_"+m+"_data"],function(a,b){"index"!==a&&(v+=f(' data-%s="%s"',a,b))}),z.checkbox||z.radio?(r=z.checkbox?"checkbox":r,r=z.radio?"radio":r,o=[f(e.options.cardView?'<div class="card-view %s">':'<td class="bs-checkbox %s">',z["class"]||""),"<input"+f(' data-index="%s"',c)+f(' name="%s"',e.options.selectItemName)+f(' type="%s"',r)+f(' value="%s"',b[e.options.idField])+f(' checked="%s"',q===!0||p||q&&q.checked?"checked":void 0)+f(' disabled="%s"',!z.checkboxEnabled||q&&q.disabled?"disabled":void 0)+" />",e.header.formatters[d]&&"string"==typeof q?q:"",e.options.cardView?"</div>":"</td>"].join(""),b[e.header.stateField]=q===!0||!!p||q&&q.checked):(q="undefined"==typeof q||null===q?e.options.undefinedText:q,o=e.options.cardView?['<div class="card-view">',e.options.showHeader?f('<span class="title" %s>%s</span>',i,g(e.columns,"field","title",m)):"",f('<span class="value">%s</span>',q),"</div>"].join(""):[f("<td%s %s %s %s %s %s %s>",t,u,i,v,w,x,y),q,"</td>"].join(""),e.options.cardView&&e.options.smartDisplay&&""===q&&(o='<div class="card-view"></div>')),h.push(o)}}),this.options.cardView&&h.push("</div></td>"),h.push("</tr>"),h.join(" ")}},q.prototype.initBody=function(b){var c=this,d=this.getData();this.trigger("pre-body",d),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=a("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=d.length);for(var e,g=a(document.createDocumentFragment()),h=this.pageFrom-1;h<this.pageTo;h++){var i=d[h],k=this.initRow(i,h,d,g);e=e||!!k,k&&k!==!0&&g.append(k)}e||g.append('<tr class="no-records-found">'+f('<td colspan="%s">%s</td>',this.$header.find("th").length,this.options.formatNoMatches())+"</tr>"),this.$body.html(g),b||this.scrollTo(0),this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",function(b){var d=a(this),e=d.parent(),g=c.data[e.data("index")],h=d[0].cellIndex,i=c.getVisibleFields(),j=i[c.options.detailView&&!c.options.cardView?h-1:h],k=c.columns[c.fieldsColumnsIndex[j]],l=n(g,j,c.options.escape);if(!d.find(".detail-icon").length&&(c.trigger("click"===b.type?"click-cell":"dbl-click-cell",j,l,g,d),c.trigger("click"===b.type?"click-row":"dbl-click-row",g,e,j),"click"===b.type&&c.options.clickToSelect&&k.clickToSelect&&c.options.ignoreClickToSelectOn(b.target))){var m=e.find(f('[name="%s"]',c.options.selectItemName));m.length&&m[0].click()}}),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",function(b){b.preventDefault();var e=a(this),g=e.parent().parent(),h=g.data("index"),i=d[h];if(g.next().is("tr.detail-view"))e.find("i").attr("class",f("%s %s",c.options.iconsPrefix,c.options.icons.detailOpen)),c.trigger("collapse-row",h,i,g.next()),g.next().remove();else{e.find("i").attr("class",f("%s %s",c.options.iconsPrefix,c.options.icons.detailClose)),g.after(f('<tr class="detail-view"><td colspan="%s"></td></tr>',g.find("td").length));var k=g.next().find("td"),l=j(c.options,c.options.detailFormatter,[h,i,k],"");1===k.length&&k.append(l),c.trigger("expand-row",h,i,k)}return c.resetView(),!1}),this.$selectItem=this.$body.find(f('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",function(b){b.stopImmediatePropagation();var d=a(this),e=d.prop("checked"),f=c.data[d.data("index")];(a(this).is(":radio")||c.options.singleSelect)&&a.each(c.options.data,function(a,b){b[c.header.stateField]=!1}),f[c.header.stateField]=e,c.options.singleSelect&&(c.$selectItem.not(this).each(function(){c.data[a(this).data("index")][c.header.stateField]=!1}),c.$selectItem.filter(":checked").not(this).prop("checked",!1)),c.updateSelected(),c.trigger(e?"check":"uncheck",f,d)}),a.each(this.header.events,function(b,d){if(d){"string"==typeof d&&(d=j(null,d));var e=c.header.fields[b],f=a.inArray(e,c.getVisibleFields());if(-1!==f){c.options.detailView&&!c.options.cardView&&(f+=1);for(var g in d)c.$body.find(">tr:not(.no-records-found)").each(function(){var b=a(this),h=b.find(c.options.cardView?".card-view":"td").eq(f),i=g.indexOf(" "),j=g.substring(0,i),k=g.substring(i+1),l=d[g];h.find(k).off(j).on(j,function(a){var d=b.data("index"),f=c.data[d],g=f[e];l.apply(this,[a,g,f,d])})})}}}),this.updateSelected(),this.resetView(),this.trigger("post-body",d)},q.prototype.initServer=function(b,c,d){var e,f=this,g={},h=a.inArray(this.options.sortName,this.header.fields),i={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};this.header.sortNames[h]&&(i.sortName=this.header.sortNames[h]),this.options.pagination&&"server"===this.options.sidePagination&&(i.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,i.pageNumber=this.options.pageNumber),(d||this.options.url||this.options.ajax)&&("limit"===this.options.queryParamsType&&(i={search:i.searchText,sort:i.sortName,order:i.sortOrder},this.options.pagination&&"server"===this.options.sidePagination&&(i.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),i.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,0===i.limit&&delete i.limit)),a.isEmptyObject(this.filterColumnsPartial)||(i.filter=JSON.stringify(this.filterColumnsPartial,null)),g=j(this.options,this.options.queryParams,[i],g),a.extend(g,c||{}),g!==!1&&(b||this.$tableLoading.show(),e=a.extend({},j(null,this.options.ajaxOptions),{type:this.options.method,url:d||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(g):g,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(a){a=j(f.options,f.options.responseHandler,[a],a),f.load(a),f.trigger("load-success",a),b||f.$tableLoading.hide()},error:function(a){var c=[];"server"===f.options.sidePagination&&(c={},c[f.options.totalField]=0,c[f.options.dataField]=[]),f.load(c),f.trigger("load-error",a.status,a),b||f.$tableLoading.hide()}}),this.options.ajax?j(this,this.options.ajax,[e],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=a.ajax(e))))},q.prototype.initSearchText=function(){if(this.options.search&&(this.searchText="",""!==this.options.searchText)){var a=this.$toolbar.find(".search input");a.val(this.options.searchText),this.onSearch({currentTarget:a,firedByInitSearchText:!0})}},q.prototype.getCaret=function(){var b=this;a.each(this.$header.find("th"),function(c,d){a(d).find(".sortable").removeClass("desc asc").addClass(a(d).data("field")===b.options.sortName?b.options.sortOrder:"both")})},q.prototype.updateSelected=function(){var b=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",b),this.$selectItem.each(function(){a(this).closest("tr")[a(this).prop("checked")?"addClass":"removeClass"]("selected")})},q.prototype.updateRows=function(){var b=this;this.$selectItem.each(function(){b.data[a(this).data("index")][b.header.stateField]=a(this).prop("checked")})},q.prototype.resetRows=function(){var b=this;a.each(this.data,function(a,c){b.$selectAll.prop("checked",!1),b.$selectItem.prop("checked",!1),b.header.stateField&&(c[b.header.stateField]=!1)}),this.initHiddenRows()},q.prototype.trigger=function(b){var c=Array.prototype.slice.call(arguments,1);b+=".bs.table",this.options[q.EVENTS[b]].apply(this.options,c),this.$el.trigger(a.Event(b),c),this.options.onAll(b,c),this.$el.trigger(a.Event("all.bs.table"),[b,c])},q.prototype.resetHeader=function(){clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout(a.proxy(this.fitHeader,this),this.$el.is(":hidden")?100:0)},q.prototype.fitHeader=function(){var b,c,d,e,g=this;if(g.$el.is(":hidden"))return void(g.timeoutId_=setTimeout(a.proxy(g.fitHeader,g),100));if(b=this.$tableBody.get(0),c=b.scrollWidth>b.clientWidth&&b.scrollHeight>b.clientHeight+this.$header.outerHeight()?i():0,this.$el.css("margin-top",-this.$header.outerHeight()),d=a(":focus"),d.length>0){var h=d.parents("th");if(h.length>0){var j=h.attr("data-field");if(void 0!==j){var k=this.$header.find("[data-field='"+j+"']");k.length>0&&k.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css({"margin-right":c}).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),e=a(".focus-temp:visible:eq(0)"),e.length>0&&(e.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each(function(){g.$header_.find(f('th[data-field="%s"]',a(this).data("field"))).data(a(this).data())});var l=this.getVisibleFields(),m=this.$header_.find("th");this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(b){var c=a(this),d=b;if(g.options.detailView&&!g.options.cardView&&(0===b&&g.$header_.find("th.detail").find(".fht-cell").width(c.innerWidth()),d=b-1),-1!==d){var e=g.$header_.find(f('th[data-field="%s"]',l[d]));e.length>1&&(e=a(m[c[0].cellIndex]));var h=e.width()-e.find(".fht-cell").width();e.find(".fht-cell").width(c.innerWidth()-h)}}),this.horizontalScroll(),this.trigger("post-header")},q.prototype.resetFooter=function(){var b=this,c=b.getData(),d=[];this.options.showFooter&&!this.options.cardView&&(!this.options.cardView&&this.options.detailView&&d.push('<td><div class="th-inner">&nbsp;</div><div class="fht-cell"></div></td>'),a.each(this.columns,function(a,e){var g,h="",i="",k=[],l={},m=f(' class="%s"',e["class"]);if(e.visible&&(!b.options.cardView||e.cardVisible)){if(h=f("text-align: %s; ",e.falign?e.falign:e.align),i=f("vertical-align: %s; ",e.valign),l=j(null,b.options.footerStyle),l&&l.css)for(g in l.css)k.push(g+": "+l.css[g]);d.push("<td",m,f(' style="%s"',h+i+k.concat().join("; ")),">"),d.push('<div class="th-inner">'),d.push(j(e,e.footerFormatter,[c],"&nbsp;")||"&nbsp;"),d.push("</div>"),d.push('<div class="fht-cell"></div>'),d.push("</div>"),d.push("</td>")}}),this.$tableFooter.find("tr").html(d.join("")),this.$tableFooter.show(),clearTimeout(this.timeoutFooter_),this.timeoutFooter_=setTimeout(a.proxy(this.fitFooter,this),this.$el.is(":hidden")?100:0))},q.prototype.fitFooter=function(){var b,c,d;return clearTimeout(this.timeoutFooter_),this.$el.is(":hidden")?void(this.timeoutFooter_=setTimeout(a.proxy(this.fitFooter,this),100)):(c=this.$el.css("width"),d=c>this.$tableBody.width()?i():0,this.$tableFooter.css({"margin-right":d}).find("table").css("width",c).attr("class",this.$el.attr("class")),b=this.$tableFooter.find("td"),this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(c){var d=a(this);b.eq(c).find(".fht-cell").width(d.innerWidth())}),void this.horizontalScroll())},q.prototype.horizontalScroll=function(){var b=this;b.trigger("scroll-body"),this.$tableBody.off("scroll").on("scroll",function(){b.options.showHeader&&b.options.height&&b.$tableHeader.scrollLeft(a(this).scrollLeft()),b.options.showFooter&&!b.options.cardView&&b.$tableFooter.scrollLeft(a(this).scrollLeft())})},q.prototype.toggleColumn=function(a,b,c){if(-1!==a&&(this.columns[a].visible=b,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var d=this.$toolbar.find(".keep-open input").prop("disabled",!1);c&&d.filter(f('[value="%s"]',a)).prop("checked",b),d.filter(":checked").length<=this.options.minimumCountColumns&&d.filter(":checked").prop("disabled",!0)}},q.prototype.getVisibleFields=function(){var b=this,c=[];return a.each(this.header.fields,function(a,d){var e=b.columns[b.fieldsColumnsIndex[d]];e.visible&&c.push(d)}),c},q.prototype.resetView=function(a){var b=0;if(a&&a.height&&(this.options.height=a.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.options.height){var c=this.$toolbar.outerHeight(!0),d=this.$pagination.outerHeight(!0),e=this.options.height-c-d;this.$tableContainer.css("height",e+"px")}return this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),void this.$tableFooter.hide()):(this.options.showHeader&&this.options.height?(this.$tableHeader.show(),this.resetHeader(),b+=this.$header.outerHeight()):(this.$tableHeader.hide(),this.trigger("post-header")),this.options.showFooter&&(this.resetFooter(),this.options.height&&(b+=this.$tableFooter.outerHeight()+1)),this.getCaret(),this.$tableContainer.css("padding-bottom",b+"px"),void this.trigger("reset-view"))},q.prototype.getData=function(b){var c=this.options.data;return(this.searchText||this.options.sortName||!a.isEmptyObject(this.filterColumns)||!a.isEmptyObject(this.filterColumnsPartial))&&(c=this.data),b?c.slice(this.pageFrom-1,this.pageTo):c},q.prototype.load=function(b){var c=!1;this.options.pagination&&"server"===this.options.sidePagination?(this.options.totalRows=b[this.options.totalField],c=b.fixedScroll,b=b[this.options.dataField]):a.isArray(b)||(c=b.fixedScroll,b=b.data),this.initData(b),this.initSearch(),this.initPagination(),this.initBody(c)},q.prototype.append=function(a){this.initData(a,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},q.prototype.prepend=function(a){this.initData(a,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},q.prototype.remove=function(b){var c,d,e=this.options.data.length;if(b.hasOwnProperty("field")&&b.hasOwnProperty("values")){for(c=e-1;c>=0;c--)d=this.options.data[c],d.hasOwnProperty(b.field)&&-1!==a.inArray(d[b.field],b.values)&&(this.options.data.splice(c,1),"server"===this.options.sidePagination&&(this.options.totalRows-=1));e!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},q.prototype.removeAll=function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))},q.prototype.getRowByUniqueId=function(a){var b,c,d,e=this.options.uniqueId,f=this.options.data.length,g=null;for(b=f-1;b>=0;b--){if(c=this.options.data[b],c.hasOwnProperty(e))d=c[e];else{if(!c._data.hasOwnProperty(e))continue;d=c._data[e]}if("string"==typeof d?a=a.toString():"number"==typeof d&&(Number(d)===d&&d%1===0?a=parseInt(a):d===Number(d)&&0!==d&&(a=parseFloat(a))),d===a){g=c;break}}return g},q.prototype.removeByUniqueId=function(a){var b=this.options.data.length,c=this.getRowByUniqueId(a);c&&this.options.data.splice(this.options.data.indexOf(c),1),b!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initBody(!0))},q.prototype.updateByUniqueId=function(b){var c=this,d=a.isArray(b)?b:[b];a.each(d,function(b,d){var e;d.hasOwnProperty("id")&&d.hasOwnProperty("row")&&(e=a.inArray(c.getRowByUniqueId(d.id),c.options.data),-1!==e&&a.extend(c.options.data[e],d.row))}),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},q.prototype.refreshColumnTitle=function(b){if(b.hasOwnProperty("field")&&b.hasOwnProperty("title")&&(this.columns[this.fieldsColumnsIndex[b.field]].title=this.options.escape?l(b.title):b.title,this.columns[this.fieldsColumnsIndex[b.field]].visible)){var c=void 0!==this.options.height?this.$tableHeader:this.$header;c.find("th[data-field]").each(function(){return a(this).data("field")===b.field?(a(a(this).find(".th-inner")[0]).text(b.title),!1):void 0})}},q.prototype.insertRow=function(a){a.hasOwnProperty("index")&&a.hasOwnProperty("row")&&(this.options.data.splice(a.index,0,a.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))},q.prototype.updateRow=function(b){var c=this,d=a.isArray(b)?b:[b];a.each(d,function(b,d){d.hasOwnProperty("index")&&d.hasOwnProperty("row")&&a.extend(c.options.data[d.index],d.row)}),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},q.prototype.initHiddenRows=function(){this.hiddenRows=[]},q.prototype.showRow=function(a){this.toggleRow(a,!0)},q.prototype.hideRow=function(a){this.toggleRow(a,!1)},q.prototype.toggleRow=function(b,c){var d,e;b.hasOwnProperty("index")?d=this.getData()[b.index]:b.hasOwnProperty("uniqueId")&&(d=this.getRowByUniqueId(b.uniqueId)),d&&(e=a.inArray(d,this.hiddenRows),c||-1!==e?c&&e>-1&&this.hiddenRows.splice(e,1):this.hiddenRows.push(d),this.initBody(!0))},q.prototype.getHiddenRows=function(){var b=this,c=this.getData(),d=[];return a.each(c,function(c,e){a.inArray(e,b.hiddenRows)>-1&&d.push(e)}),this.hiddenRows=d,d},q.prototype.mergeCells=function(b){var c,d,e,f=b.index,g=a.inArray(b.field,this.getVisibleFields()),h=b.rowspan||1,i=b.colspan||1,j=this.$body.find(">tr");if(this.options.detailView&&!this.options.cardView&&(g+=1),e=j.eq(f).find(">td").eq(g),!(0>f||0>g||f>=this.data.length)){for(c=f;f+h>c;c++)for(d=g;g+i>d;d++)j.eq(c).find(">td").eq(d).hide();e.attr("rowspan",h).attr("colspan",i).show()}},q.prototype.updateCell=function(a){a.hasOwnProperty("index")&&a.hasOwnProperty("field")&&a.hasOwnProperty("value")&&(this.data[a.index][a.field]=a.value,a.reinit!==!1&&(this.initSort(),this.initBody(!0)))},q.prototype.updateCellById=function(b){var c=this;if(b.hasOwnProperty("id")&&b.hasOwnProperty("field")&&b.hasOwnProperty("value")){var d=a.isArray(b)?b:[b];a.each(d,function(b,d){var e;e=a.inArray(c.getRowByUniqueId(d.id),c.options.data),-1!==e&&(c.data[e][d.field]=d.value)}),b.reinit!==!1&&(this.initSort(),this.initBody(!0))}},q.prototype.getOptions=function(){return a.extend(!0,{},this.options)},q.prototype.getSelections=function(){var b=this;return a.grep(this.options.data,function(a){return a[b.header.stateField]===!0})},q.prototype.getAllSelections=function(){var b=this;return a.grep(this.options.data,function(a){return a[b.header.stateField]})},q.prototype.checkAll=function(){this.checkAll_(!0)},q.prototype.uncheckAll=function(){this.checkAll_(!1)},q.prototype.checkInvert=function(){var b=this,c=b.$selectItem.filter(":enabled"),d=c.filter(":checked");c.each(function(){a(this).prop("checked",!a(this).prop("checked"))}),b.updateRows(),b.updateSelected(),b.trigger("uncheck-some",d),d=b.getSelections(),b.trigger("check-some",d)},q.prototype.checkAll_=function(a){var b;a||(b=this.getSelections()),this.$selectAll.add(this.$selectAll_).prop("checked",a),this.$selectItem.filter(":enabled").prop("checked",a),this.updateRows(),a&&(b=this.getSelections()),this.trigger(a?"check-all":"uncheck-all",b)},q.prototype.check=function(a){this.check_(!0,a)},q.prototype.uncheck=function(a){this.check_(!1,a)},q.prototype.check_=function(a,b){var c=this.$selectItem.filter(f('[data-index="%s"]',b)).prop("checked",a);this.data[b][this.header.stateField]=a,this.updateSelected(),this.trigger(a?"check":"uncheck",this.data[b],c)},q.prototype.checkBy=function(a){this.checkBy_(!0,a)},q.prototype.uncheckBy=function(a){this.checkBy_(!1,a)},q.prototype.checkBy_=function(b,c){if(c.hasOwnProperty("field")&&c.hasOwnProperty("values")){var d=this,e=[];a.each(this.options.data,function(g,h){if(!h.hasOwnProperty(c.field))return!1;if(-1!==a.inArray(h[c.field],c.values)){var i=d.$selectItem.filter(":enabled").filter(f('[data-index="%s"]',g)).prop("checked",b);h[d.header.stateField]=b,e.push(h),d.trigger(b?"check":"uncheck",h,i)}}),this.updateSelected(),this.trigger(b?"check-some":"uncheck-some",e)}},q.prototype.destroy=function(){this.$el.insertBefore(this.$container),a(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")},q.prototype.showLoading=function(){this.$tableLoading.show()},q.prototype.hideLoading=function(){this.$tableLoading.hide()},q.prototype.togglePagination=function(){this.options.pagination=!this.options.pagination;var a=this.$toolbar.find('button[name="paginationSwitch"] i');this.options.pagination?a.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchDown):a.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchUp),this.updatePagination()},q.prototype.toggleFullscreen=function(){this.$el.closest(".bootstrap-table").toggleClass("fullscreen")},q.prototype.refresh=function(a){a&&a.url&&(this.options.url=a.url),a&&a.pageNumber&&(this.options.pageNumber=a.pageNumber),a&&a.pageSize&&(this.options.pageSize=a.pageSize),this.initServer(a&&a.silent,a&&a.query,a&&a.url),this.trigger("refresh",a)},q.prototype.resetWidth=function(){this.options.showHeader&&this.options.height&&this.fitHeader(),this.options.showFooter&&!this.options.cardView&&this.fitFooter()},q.prototype.showColumn=function(a){this.toggleColumn(this.fieldsColumnsIndex[a],!0,!0)},q.prototype.hideColumn=function(a){this.toggleColumn(this.fieldsColumnsIndex[a],!1,!0)},q.prototype.getHiddenColumns=function(){return a.grep(this.columns,function(a){return!a.visible})},q.prototype.getVisibleColumns=function(){return a.grep(this.columns,function(a){return a.visible})},q.prototype.toggleAllColumns=function(b){var c=this;if(a.each(this.columns,function(a){c.columns[a].visible=b}),this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var d=this.$toolbar.find(".keep-open input").prop("disabled",!1);d.filter(":checked").length<=this.options.minimumCountColumns&&d.filter(":checked").prop("disabled",!0)}},q.prototype.showAllColumns=function(){this.toggleAllColumns(!0)},q.prototype.hideAllColumns=function(){this.toggleAllColumns(!1)},q.prototype.filterBy=function(b){this.filterColumns=a.isEmptyObject(b)?{}:b,this.options.pageNumber=1,this.initSearch(),this.updatePagination()},q.prototype.scrollTo=function(a){return"string"==typeof a&&(a="bottom"===a?this.$tableBody[0].scrollHeight:0),"number"==typeof a&&this.$tableBody.scrollTop(a),"undefined"==typeof a?this.$tableBody.scrollTop():void 0},q.prototype.getScrollPosition=function(){return this.scrollTo()},q.prototype.selectPage=function(a){a>0&&a<=this.options.totalPages&&(this.options.pageNumber=a,this.updatePagination())},q.prototype.prevPage=function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())},q.prototype.nextPage=function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())},q.prototype.toggleView=function(){this.options.cardView=!this.options.cardView,this.initHeader();var a=this.$toolbar.find('button[name="toggle"] i');this.options.cardView?(a.removeClass(this.options.icons.toggleOff),a.addClass(this.options.icons.toggleOn)):(a.removeClass(this.options.icons.toggleOn),a.addClass(this.options.icons.toggleOff)),this.initBody(),this.trigger("toggle",this.options.cardView)},q.prototype.refreshOptions=function(b){k(this.options,b,!0)||(this.options=a.extend(this.options,b),this.trigger("refresh-options",this.options),this.destroy(),this.init())},q.prototype.resetSearch=function(a){var b=this.$toolbar.find(".search input");b.val(a||""),this.onSearch({currentTarget:b})},q.prototype.expandRow_=function(a,b){var c=this.$body.find(f('> tr[data-index="%s"]',b));c.next().is("tr.detail-view")===(a?!1:!0)&&c.find("> td > .detail-icon").click()},q.prototype.expandRow=function(a){this.expandRow_(!0,a)},q.prototype.collapseRow=function(a){this.expandRow_(!1,a)},q.prototype.expandAllRows=function(b){if(b){var c=this.$body.find(f('> tr[data-index="%s"]',0)),d=this,e=null,g=!1,h=-1;if(c.next().is("tr.detail-view")?c.next().next().is("tr.detail-view")||(c.next().find(".detail-icon").click(),g=!0):(c.find("> td > .detail-icon").click(),g=!0),g)try{h=setInterval(function(){e=d.$body.find("tr.detail-view").last().find(".detail-icon"),e.length>0?e.click():clearInterval(h)},1)}catch(i){clearInterval(h)}}else for(var j=this.$body.children(),k=0;k<j.length;k++)this.expandRow_(!0,a(j[k]).data("index"))},q.prototype.collapseAllRows=function(b){if(b)this.expandRow_(!1,0);else for(var c=this.$body.children(),d=0;d<c.length;d++)this.expandRow_(!1,a(c[d]).data("index"))},q.prototype.updateFormatText=function(a,b){this.options[f("format%s",a)]&&("string"==typeof b?this.options[f("format%s",a)]=function(){return b}:"function"==typeof b&&(this.options[f("format%s",a)]=b)),this.initToolbar(),this.initPagination(),this.initBody()};var r=["getOptions","getSelections","getAllSelections","getData","load","append","prepend","remove","removeAll","insertRow","updateRow","updateCell","updateByUniqueId","removeByUniqueId","getRowByUniqueId","showRow","hideRow","getHiddenRows","mergeCells","refreshColumnTitle","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","resetView","resetWidth","destroy","showLoading","hideLoading","showColumn","hideColumn","getHiddenColumns","getVisibleColumns","showAllColumns","hideAllColumns","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","togglePagination","toggleView","refreshOptions","resetSearch","expandRow","collapseRow","expandAllRows","collapseAllRows","updateFormatText","updateCellById"];a.fn.bootstrapTable=function(b){var c,d=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=a(this),f=e.data("bootstrap.table"),g=a.extend({},q.DEFAULTS,e.data(),"object"==typeof b&&b);if("string"==typeof b){if(a.inArray(b,r)<0)throw new Error("Unknown method: "+b);if(!f)return;c=f[b].apply(f,d),"destroy"===b&&e.removeData("bootstrap.table")}f||e.data("bootstrap.table",f=new q(this,g))}),"undefined"==typeof c?this:c},a.fn.bootstrapTable.Constructor=q,a.fn.bootstrapTable.defaults=q.DEFAULTS,a.fn.bootstrapTable.columnDefaults=q.COLUMN_DEFAULTS,a.fn.bootstrapTable.locales=q.LOCALES,a.fn.bootstrapTable.methods=r,a.fn.bootstrapTable.utils={bootstrapVersion:b,sprintf:f,compareObjects:k,calculateObjectValue:j,getItemField:n,objectKeys:p,isIEBrowser:o},a(function(){a('[data-toggle="table"]').bootstrapTable()})}(jQuery);
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t=t||self).BootstrapTable=e(t.jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function i(t,e){return t(e={exports:{}},e.exports),e.exports}var n=function(t){return t&&t.Math==Math&&t},o=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof e&&e)||Function("return this")(),r=function(t){try{return!!t()}catch(t){return!0}},a=!r((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),s={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,c={f:l&&!s.call({1:2},1)?function(t){var e=l(this,t);return!!e&&e.enumerable}:s},h=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},u={}.toString,d=function(t){return u.call(t).slice(8,-1)},f="".split,p=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?f.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return p(g(t))},b=function(t){return"object"==typeof t?null!==t:"function"==typeof t},m=function(t,e){if(!b(t))return t;var i,n;if(e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;if("function"==typeof(i=t.valueOf)&&!b(n=i.call(t)))return n;if(!e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;throw TypeError("Can't convert object to primitive value")},y={}.hasOwnProperty,w=function(t,e){return y.call(t,e)},S=o.document,x=b(S)&&b(S.createElement),k=function(t){return x?S.createElement(t):{}},O=!a&&!r((function(){return 7!=Object.defineProperty(k("div"),"a",{get:function(){return 7}}).a})),C=Object.getOwnPropertyDescriptor,T={f:a?C:function(t,e){if(t=v(t),e=m(e,!0),O)try{return C(t,e)}catch(t){}if(w(t,e))return h(!c.f.call(t,e),t[e])}},P=function(t){if(!b(t))throw TypeError(String(t)+" is not an object");return t},$=Object.defineProperty,I={f:a?$:function(t,e,i){if(P(t),e=m(e,!0),P(i),O)try{return $(t,e,i)}catch(t){}if("get"in i||"set"in i)throw TypeError("Accessors not supported");return"value"in i&&(t[e]=i.value),t}},A=a?function(t,e,i){return I.f(t,e,h(1,i))}:function(t,e,i){return t[e]=i,t},E=function(t,e){try{A(o,t,e)}catch(i){o[t]=e}return e},R=o["__core-js_shared__"]||E("__core-js_shared__",{}),j=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return j.call(t)});var N,F,_,B=R.inspectSource,V=o.WeakMap,L="function"==typeof V&&/native code/.test(B(V)),D=i((function(t){(t.exports=function(t,e){return R[t]||(R[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),H=0,M=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++H+M).toString(36)},z=D("keys"),q=function(t){return z[t]||(z[t]=U(t))},W={},G=o.WeakMap;if(L){var K=new G,J=K.get,Y=K.has,X=K.set;N=function(t,e){return X.call(K,t,e),e},F=function(t){return J.call(K,t)||{}},_=function(t){return Y.call(K,t)}}else{var Q=q("state");W[Q]=!0,N=function(t,e){return A(t,Q,e),e},F=function(t){return w(t,Q)?t[Q]:{}},_=function(t){return w(t,Q)}}var Z,tt={set:N,get:F,has:_,enforce:function(t){return _(t)?F(t):N(t,{})},getterFor:function(t){return function(e){var i;if(!b(e)||(i=F(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return i}}},et=i((function(t){var e=tt.get,i=tt.enforce,n=String(String).split("String");(t.exports=function(t,e,r,a){var s=!!a&&!!a.unsafe,l=!!a&&!!a.enumerable,c=!!a&&!!a.noTargetGet;"function"==typeof r&&("string"!=typeof e||w(r,"name")||A(r,"name",e),i(r).source=n.join("string"==typeof e?e:"")),t!==o?(s?!c&&t[e]&&(l=!0):delete t[e],l?t[e]=r:A(t,e,r)):l?t[e]=r:E(e,r)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||B(this)}))})),it=o,nt=function(t){return"function"==typeof t?t:void 0},ot=function(t,e){return arguments.length<2?nt(it[t])||nt(o[t]):it[t]&&it[t][e]||o[t]&&o[t][e]},rt=Math.ceil,at=Math.floor,st=function(t){return isNaN(t=+t)?0:(t>0?at:rt)(t)},lt=Math.min,ct=function(t){return t>0?lt(st(t),9007199254740991):0},ht=Math.max,ut=Math.min,dt=function(t,e){var i=st(t);return i<0?ht(i+e,0):ut(i,e)},ft=function(t){return function(e,i,n){var o,r=v(e),a=ct(r.length),s=dt(n,a);if(t&&i!=i){for(;a>s;)if((o=r[s++])!=o)return!0}else for(;a>s;s++)if((t||s in r)&&r[s]===i)return t||s||0;return!t&&-1}},pt={includes:ft(!0),indexOf:ft(!1)},gt=pt.indexOf,vt=function(t,e){var i,n=v(t),o=0,r=[];for(i in n)!w(W,i)&&w(n,i)&&r.push(i);for(;e.length>o;)w(n,i=e[o++])&&(~gt(r,i)||r.push(i));return r},bt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],mt=bt.concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return vt(t,mt)}},wt={f:Object.getOwnPropertySymbols},St=ot("Reflect","ownKeys")||function(t){var e=yt.f(P(t)),i=wt.f;return i?e.concat(i(t)):e},xt=function(t,e){for(var i=St(e),n=I.f,o=T.f,r=0;r<i.length;r++){var a=i[r];w(t,a)||n(t,a,o(e,a))}},kt=/#|\.prototype\./,Ot=function(t,e){var i=Tt[Ct(t)];return i==$t||i!=Pt&&("function"==typeof e?r(e):!!e)},Ct=Ot.normalize=function(t){return String(t).replace(kt,".").toLowerCase()},Tt=Ot.data={},Pt=Ot.NATIVE="N",$t=Ot.POLYFILL="P",It=Ot,At=T.f,Et=function(t,e){var i,n,r,a,s,l=t.target,c=t.global,h=t.stat;if(i=c?o:h?o[l]||E(l,{}):(o[l]||{}).prototype)for(n in e){if(a=e[n],r=t.noTargetGet?(s=At(i,n))&&s.value:i[n],!It(c?n:l+(h?".":"#")+n,t.forced)&&void 0!==r){if(typeof a==typeof r)continue;xt(a,r)}(t.sham||r&&r.sham)&&A(a,"sham",!0),et(i,n,a,t)}},Rt=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())})),jt=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),Nt=Array.isArray||function(t){return"Array"==d(t)},Ft=function(t){return Object(g(t))},_t=Object.keys||function(t){return vt(t,bt)},Bt=a?Object.defineProperties:function(t,e){P(t);for(var i,n=_t(e),o=n.length,r=0;o>r;)I.f(t,i=n[r++],e[i]);return t},Vt=ot("document","documentElement"),Lt=q("IE_PROTO"),Dt=function(){},Ht=function(t){return"<script>"+t+"<\/script>"},Mt=function(){try{Z=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Mt=Z?function(t){t.write(Ht("")),t.close();var e=t.parentWindow.Object;return t=null,e}(Z):((e=k("iframe")).style.display="none",Vt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Ht("document.F=Object")),t.close(),t.F);for(var i=bt.length;i--;)delete Mt.prototype[bt[i]];return Mt()};W[Lt]=!0;var Ut=Object.create||function(t,e){var i;return null!==t?(Dt.prototype=P(t),i=new Dt,Dt.prototype=null,i[Lt]=t):i=Mt(),void 0===e?i:Bt(i,e)},zt=yt.f,qt={}.toString,Wt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Gt={f:function(t){return Wt&&"[object Window]"==qt.call(t)?function(t){try{return zt(t)}catch(t){return Wt.slice()}}(t):zt(v(t))}},Kt=D("wks"),Jt=o.Symbol,Yt=jt?Jt:U,Xt=function(t){return w(Kt,t)||(Rt&&w(Jt,t)?Kt[t]=Jt[t]:Kt[t]=Yt("Symbol."+t)),Kt[t]},Qt={f:Xt},Zt=I.f,te=function(t){var e=it.Symbol||(it.Symbol={});w(e,t)||Zt(e,t,{value:Qt.f(t)})},ee=I.f,ie=Xt("toStringTag"),ne=function(t,e,i){t&&!w(t=i?t:t.prototype,ie)&&ee(t,ie,{configurable:!0,value:e})},oe=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},re=Xt("species"),ae=function(t,e){var i;return Nt(t)&&("function"!=typeof(i=t.constructor)||i!==Array&&!Nt(i.prototype)?b(i)&&null===(i=i[re])&&(i=void 0):i=void 0),new(void 0===i?Array:i)(0===e?0:e)},se=[].push,le=function(t){var e=1==t,i=2==t,n=3==t,o=4==t,r=6==t,a=5==t||r;return function(s,l,c,h){for(var u,d,f=Ft(s),g=p(f),v=function(t,e,i){if(oe(t),void 0===e)return t;switch(i){case 0:return function(){return t.call(e)};case 1:return function(i){return t.call(e,i)};case 2:return function(i,n){return t.call(e,i,n)};case 3:return function(i,n,o){return t.call(e,i,n,o)}}return function(){return t.apply(e,arguments)}}(l,c,3),b=ct(g.length),m=0,y=h||ae,w=e?y(s,b):i?y(s,0):void 0;b>m;m++)if((a||m in g)&&(d=v(u=g[m],m,f),t))if(e)w[m]=d;else if(d)switch(t){case 3:return!0;case 5:return u;case 6:return m;case 2:se.call(w,u)}else if(o)return!1;return r?-1:n||o?o:w}},ce={forEach:le(0),map:le(1),filter:le(2),some:le(3),every:le(4),find:le(5),findIndex:le(6)},he=ce.forEach,ue=q("hidden"),de=Xt("toPrimitive"),fe=tt.set,pe=tt.getterFor("Symbol"),ge=Object.prototype,ve=o.Symbol,be=ot("JSON","stringify"),me=T.f,ye=I.f,we=Gt.f,Se=c.f,xe=D("symbols"),ke=D("op-symbols"),Oe=D("string-to-symbol-registry"),Ce=D("symbol-to-string-registry"),Te=D("wks"),Pe=o.QObject,$e=!Pe||!Pe.prototype||!Pe.prototype.findChild,Ie=a&&r((function(){return 7!=Ut(ye({},"a",{get:function(){return ye(this,"a",{value:7}).a}})).a}))?function(t,e,i){var n=me(ge,e);n&&delete ge[e],ye(t,e,i),n&&t!==ge&&ye(ge,e,n)}:ye,Ae=function(t,e){var i=xe[t]=Ut(ve.prototype);return fe(i,{type:"Symbol",tag:t,description:e}),a||(i.description=e),i},Ee=Rt&&"symbol"==typeof ve.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ve},Re=function(t,e,i){t===ge&&Re(ke,e,i),P(t);var n=m(e,!0);return P(i),w(xe,n)?(i.enumerable?(w(t,ue)&&t[ue][n]&&(t[ue][n]=!1),i=Ut(i,{enumerable:h(0,!1)})):(w(t,ue)||ye(t,ue,h(1,{})),t[ue][n]=!0),Ie(t,n,i)):ye(t,n,i)},je=function(t,e){P(t);var i=v(e),n=_t(i).concat(Be(i));return he(n,(function(e){a&&!Ne.call(i,e)||Re(t,e,i[e])})),t},Ne=function(t){var e=m(t,!0),i=Se.call(this,e);return!(this===ge&&w(xe,e)&&!w(ke,e))&&(!(i||!w(this,e)||!w(xe,e)||w(this,ue)&&this[ue][e])||i)},Fe=function(t,e){var i=v(t),n=m(e,!0);if(i!==ge||!w(xe,n)||w(ke,n)){var o=me(i,n);return!o||!w(xe,n)||w(i,ue)&&i[ue][n]||(o.enumerable=!0),o}},_e=function(t){var e=we(v(t)),i=[];return he(e,(function(t){w(xe,t)||w(W,t)||i.push(t)})),i},Be=function(t){var e=t===ge,i=we(e?ke:v(t)),n=[];return he(i,(function(t){!w(xe,t)||e&&!w(ge,t)||n.push(xe[t])})),n};if(Rt||(et((ve=function(){if(this instanceof ve)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=U(t),i=function(t){this===ge&&i.call(ke,t),w(this,ue)&&w(this[ue],e)&&(this[ue][e]=!1),Ie(this,e,h(1,t))};return a&&$e&&Ie(ge,e,{configurable:!0,set:i}),Ae(e,t)}).prototype,"toString",(function(){return pe(this).tag})),c.f=Ne,I.f=Re,T.f=Fe,yt.f=Gt.f=_e,wt.f=Be,a&&(ye(ve.prototype,"description",{configurable:!0,get:function(){return pe(this).description}}),et(ge,"propertyIsEnumerable",Ne,{unsafe:!0}))),jt||(Qt.f=function(t){return Ae(Xt(t),t)}),Et({global:!0,wrap:!0,forced:!Rt,sham:!Rt},{Symbol:ve}),he(_t(Te),(function(t){te(t)})),Et({target:"Symbol",stat:!0,forced:!Rt},{for:function(t){var e=String(t);if(w(Oe,e))return Oe[e];var i=ve(e);return Oe[e]=i,Ce[i]=e,i},keyFor:function(t){if(!Ee(t))throw TypeError(t+" is not a symbol");if(w(Ce,t))return Ce[t]},useSetter:function(){$e=!0},useSimple:function(){$e=!1}}),Et({target:"Object",stat:!0,forced:!Rt,sham:!a},{create:function(t,e){return void 0===e?Ut(t):je(Ut(t),e)},defineProperty:Re,defineProperties:je,getOwnPropertyDescriptor:Fe}),Et({target:"Object",stat:!0,forced:!Rt},{getOwnPropertyNames:_e,getOwnPropertySymbols:Be}),Et({target:"Object",stat:!0,forced:r((function(){wt.f(1)}))},{getOwnPropertySymbols:function(t){return wt.f(Ft(t))}}),be){var Ve=!Rt||r((function(){var t=ve();return"[null]"!=be([t])||"{}"!=be({a:t})||"{}"!=be(Object(t))}));Et({target:"JSON",stat:!0,forced:Ve},{stringify:function(t,e,i){for(var n,o=[t],r=1;arguments.length>r;)o.push(arguments[r++]);if(n=e,(b(e)||void 0!==t)&&!Ee(t))return Nt(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!Ee(e))return e}),o[1]=e,be.apply(null,o)}})}ve.prototype[de]||A(ve.prototype,de,ve.prototype.valueOf),ne(ve,"Symbol"),W[ue]=!0;var Le=I.f,De=o.Symbol;if(a&&"function"==typeof De&&(!("description"in De.prototype)||void 0!==De().description)){var He={},Me=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof Me?new De(t):void 0===t?De():De(t);return""===t&&(He[e]=!0),e};xt(Me,De);var Ue=Me.prototype=De.prototype;Ue.constructor=Me;var ze=Ue.toString,qe="Symbol(test)"==String(De("test")),We=/^Symbol\((.*)\)[^)]+$/;Le(Ue,"description",{configurable:!0,get:function(){var t=b(this)?this.valueOf():this,e=ze.call(t);if(w(He,t))return"";var i=qe?e.slice(7,-1):e.replace(We,"$1");return""===i?void 0:i}}),Et({global:!0,forced:!0},{Symbol:Me})}te("iterator");var Ge,Ke,Je=function(t,e,i){var n=m(e);n in t?I.f(t,n,h(0,i)):t[n]=i},Ye=ot("navigator","userAgent")||"",Xe=o.process,Qe=Xe&&Xe.versions,Ze=Qe&&Qe.v8;Ze?Ke=(Ge=Ze.split("."))[0]+Ge[1]:Ye&&(!(Ge=Ye.match(/Edge\/(\d+)/))||Ge[1]>=74)&&(Ge=Ye.match(/Chrome\/(\d+)/))&&(Ke=Ge[1]);var ti=Ke&&+Ke,ei=Xt("species"),ii=function(t){return ti>=51||!r((function(){var e=[];return(e.constructor={})[ei]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},ni=Xt("isConcatSpreadable"),oi=ti>=51||!r((function(){var t=[];return t[ni]=!1,t.concat()[0]!==t})),ri=ii("concat"),ai=function(t){if(!b(t))return!1;var e=t[ni];return void 0!==e?!!e:Nt(t)};Et({target:"Array",proto:!0,forced:!oi||!ri},{concat:function(t){var e,i,n,o,r,a=Ft(this),s=ae(a,0),l=0;for(e=-1,n=arguments.length;e<n;e++)if(r=-1===e?a:arguments[e],ai(r)){if(l+(o=ct(r.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(i=0;i<o;i++,l++)i in r&&Je(s,l,r[i])}else{if(l>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Je(s,l++,r)}return s.length=l,s}});var si=ce.filter,li=ii("filter"),ci=li&&!r((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Et({target:"Array",proto:!0,forced:!li||!ci},{filter:function(t){return si(this,t,arguments.length>1?arguments[1]:void 0)}});var hi=Xt("unscopables"),ui=Array.prototype;null==ui[hi]&&I.f(ui,hi,{configurable:!0,value:Ut(null)});var di=function(t){ui[hi][t]=!0},fi=ce.find,pi=!0;"find"in[]&&Array(1).find((function(){pi=!1})),Et({target:"Array",proto:!0,forced:pi},{find:function(t){return fi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("find");var gi=ce.findIndex,vi=!0;"findIndex"in[]&&Array(1).findIndex((function(){vi=!1})),Et({target:"Array",proto:!0,forced:vi},{findIndex:function(t){return gi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("findIndex");var bi=pt.includes;Et({target:"Array",proto:!0},{includes:function(t){return bi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("includes");var mi=function(t,e){var i=[][t];return!i||!r((function(){i.call(null,e||function(){throw 1},1)}))},yi=pt.indexOf,wi=[].indexOf,Si=!!wi&&1/[1].indexOf(1,-0)<0,xi=mi("indexOf");Et({target:"Array",proto:!0,forced:Si||xi},{indexOf:function(t){return Si?wi.apply(this,arguments)||0:yi(this,t,arguments.length>1?arguments[1]:void 0)}});var ki,Oi,Ci,Ti=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Pi=q("IE_PROTO"),$i=Object.prototype,Ii=Ti?Object.getPrototypeOf:function(t){return t=Ft(t),w(t,Pi)?t[Pi]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?$i:null},Ai=Xt("iterator"),Ei=!1;[].keys&&("next"in(Ci=[].keys())?(Oi=Ii(Ii(Ci)))!==Object.prototype&&(ki=Oi):Ei=!0),null==ki&&(ki={}),w(ki,Ai)||A(ki,Ai,(function(){return this}));var Ri={IteratorPrototype:ki,BUGGY_SAFARI_ITERATORS:Ei},ji=Ri.IteratorPrototype,Ni=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,i={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(i,[]),e=i instanceof Array}catch(t){}return function(i,n){return P(i),function(t){if(!b(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(n),e?t.call(i,n):i.__proto__=n,i}}():void 0),Fi=Ri.IteratorPrototype,_i=Ri.BUGGY_SAFARI_ITERATORS,Bi=Xt("iterator"),Vi=function(){return this},Li=function(t,e,i,n,o,r,a){!function(t,e,i){var n=e+" Iterator";t.prototype=Ut(ji,{next:h(1,i)}),ne(t,n,!1)}(i,e,n);var s,l,c,u=function(t){if(t===o&&v)return v;if(!_i&&t in p)return p[t];switch(t){case"keys":case"values":case"entries":return function(){return new i(this,t)}}return function(){return new i(this)}},d=e+" Iterator",f=!1,p=t.prototype,g=p[Bi]||p["@@iterator"]||o&&p[o],v=!_i&&g||u(o),b="Array"==e&&p.entries||g;if(b&&(s=Ii(b.call(new t)),Fi!==Object.prototype&&s.next&&(Ii(s)!==Fi&&(Ni?Ni(s,Fi):"function"!=typeof s[Bi]&&A(s,Bi,Vi)),ne(s,d,!0))),"values"==o&&g&&"values"!==g.name&&(f=!0,v=function(){return g.call(this)}),p[Bi]!==v&&A(p,Bi,v),o)if(l={values:u("values"),keys:r?v:u("keys"),entries:u("entries")},a)for(c in l)!_i&&!f&&c in p||et(p,c,l[c]);else Et({target:e,proto:!0,forced:_i||f},l);return l},Di=tt.set,Hi=tt.getterFor("Array Iterator"),Mi=Li(Array,"Array",(function(t,e){Di(this,{type:"Array Iterator",target:v(t),index:0,kind:e})}),(function(){var t=Hi(this),e=t.target,i=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==i?{value:n,done:!1}:"values"==i?{value:e[n],done:!1}:{value:[n,e[n]],done:!1}}),"values");di("keys"),di("values"),di("entries");var Ui=[].join,zi=p!=Object,qi=mi("join",",");Et({target:"Array",proto:!0,forced:zi||qi},{join:function(t){return Ui.call(v(this),void 0===t?",":t)}});var Wi=ce.map,Gi=ii("map"),Ki=Gi&&!r((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Et({target:"Array",proto:!0,forced:!Gi||!Ki},{map:function(t){return Wi(this,t,arguments.length>1?arguments[1]:void 0)}});var Ji=[].reverse,Yi=[1,2];Et({target:"Array",proto:!0,forced:String(Yi)===String(Yi.reverse())},{reverse:function(){return Nt(this)&&(this.length=this.length),Ji.call(this)}});var Xi=Xt("species"),Qi=[].slice,Zi=Math.max;Et({target:"Array",proto:!0,forced:!ii("slice")},{slice:function(t,e){var i,n,o,r=v(this),a=ct(r.length),s=dt(t,a),l=dt(void 0===e?a:e,a);if(Nt(r)&&("function"!=typeof(i=r.constructor)||i!==Array&&!Nt(i.prototype)?b(i)&&null===(i=i[Xi])&&(i=void 0):i=void 0,i===Array||void 0===i))return Qi.call(r,s,l);for(n=new(void 0===i?Array:i)(Zi(l-s,0)),o=0;s<l;s++,o++)s in r&&Je(n,o,r[s]);return n.length=o,n}});var tn=[],en=tn.sort,nn=r((function(){tn.sort(void 0)})),on=r((function(){tn.sort(null)})),rn=mi("sort");Et({target:"Array",proto:!0,forced:nn||!on||rn},{sort:function(t){return void 0===t?en.call(Ft(this)):en.call(Ft(this),oe(t))}});var an=Math.max,sn=Math.min;Et({target:"Array",proto:!0,forced:!ii("splice")},{splice:function(t,e){var i,n,o,r,a,s,l=Ft(this),c=ct(l.length),h=dt(t,c),u=arguments.length;if(0===u?i=n=0:1===u?(i=0,n=c-h):(i=u-2,n=sn(an(st(e),0),c-h)),c+i-n>9007199254740991)throw TypeError("Maximum allowed length exceeded");for(o=ae(l,n),r=0;r<n;r++)(a=h+r)in l&&Je(o,r,l[a]);if(o.length=n,i<n){for(r=h;r<c-n;r++)s=r+i,(a=r+n)in l?l[s]=l[a]:delete l[s];for(r=c;r>c-n+i;r--)delete l[r-1]}else if(i>n)for(r=c-n;r>h;r--)s=r+i-1,(a=r+n-1)in l?l[s]=l[a]:delete l[s];for(r=0;r<i;r++)l[r+h]=arguments[r+2];return l.length=c-n+i,o}});var ln=function(t,e,i){var n,o;return Ni&&"function"==typeof(n=e.constructor)&&n!==i&&b(o=n.prototype)&&o!==i.prototype&&Ni(t,o),t},cn="\t\n\v\f\r                　\u2028\u2029\ufeff",hn="["+cn+"]",un=RegExp("^"+hn+hn+"*"),dn=RegExp(hn+hn+"*$"),fn=function(t){return function(e){var i=String(g(e));return 1&t&&(i=i.replace(un,"")),2&t&&(i=i.replace(dn,"")),i}},pn={start:fn(1),end:fn(2),trim:fn(3)},gn=yt.f,vn=T.f,bn=I.f,mn=pn.trim,yn=o.Number,wn=yn.prototype,Sn="Number"==d(Ut(wn)),xn=function(t){var e,i,n,o,r,a,s,l,c=m(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=mn(c)).charCodeAt(0))||45===e){if(88===(i=c.charCodeAt(2))||120===i)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:n=2,o=49;break;case 79:case 111:n=8,o=55;break;default:return+c}for(a=(r=c.slice(2)).length,s=0;s<a;s++)if((l=r.charCodeAt(s))<48||l>o)return NaN;return parseInt(r,n)}return+c};if(It("Number",!yn(" 0o1")||!yn("0b1")||yn("+0x1"))){for(var kn,On=function(t){var e=arguments.length<1?0:t,i=this;return i instanceof On&&(Sn?r((function(){wn.valueOf.call(i)})):"Number"!=d(i))?ln(new yn(xn(e)),i,On):xn(e)},Cn=a?gn(yn):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),Tn=0;Cn.length>Tn;Tn++)w(yn,kn=Cn[Tn])&&!w(On,kn)&&bn(On,kn,vn(yn,kn));On.prototype=wn,wn.constructor=On,et(o,"Number",On)}var Pn=Object.assign,$n=Object.defineProperty,In=!Pn||r((function(){if(a&&1!==Pn({b:1},Pn($n({},"a",{enumerable:!0,get:function(){$n(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},i=Symbol();return t[i]=7,"abcdefghijklmnopqrst".split("").forEach((function(t){e[t]=t})),7!=Pn({},t)[i]||"abcdefghijklmnopqrst"!=_t(Pn({},e)).join("")}))?function(t,e){for(var i=Ft(t),n=arguments.length,o=1,r=wt.f,s=c.f;n>o;)for(var l,h=p(arguments[o++]),u=r?_t(h).concat(r(h)):_t(h),d=u.length,f=0;d>f;)l=u[f++],a&&!s.call(h,l)||(i[l]=h[l]);return i}:Pn;Et({target:"Object",stat:!0,forced:Object.assign!==In},{assign:In});var An=c.f,En=function(t){return function(e){for(var i,n=v(e),o=_t(n),r=o.length,s=0,l=[];r>s;)i=o[s++],a&&!An.call(n,i)||l.push(t?[i,n[i]]:n[i]);return l}},Rn={entries:En(!0),values:En(!1)}.entries;Et({target:"Object",stat:!0},{entries:function(t){return Rn(t)}});var jn={};jn[Xt("toStringTag")]="z";var Nn="[object z]"===String(jn),Fn=Xt("toStringTag"),_n="Arguments"==d(function(){return arguments}()),Bn=Nn?d:function(t){var e,i,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(i=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),Fn))?i:_n?d(e):"Object"==(n=d(e))&&"function"==typeof e.callee?"Arguments":n},Vn=Nn?{}.toString:function(){return"[object "+Bn(this)+"]"};Nn||et(Object.prototype,"toString",Vn,{unsafe:!0});var Ln=pn.trim,Dn=o.parseFloat,Hn=1/Dn(cn+"-0")!=-1/0?function(t){var e=Ln(String(t)),i=Dn(e);return 0===i&&"-"==e.charAt(0)?-0:i}:Dn;Et({global:!0,forced:parseFloat!=Hn},{parseFloat:Hn});var Mn=pn.trim,Un=o.parseInt,zn=/^[+-]?0[Xx]/,qn=8!==Un(cn+"08")||22!==Un(cn+"0x16")?function(t,e){var i=Mn(String(t));return Un(i,e>>>0||(zn.test(i)?16:10))}:Un;Et({global:!0,forced:parseInt!=qn},{parseInt:qn});var Wn=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function Gn(t,e){return RegExp(t,e)}var Kn,Jn,Yn={UNSUPPORTED_Y:r((function(){var t=Gn("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:r((function(){var t=Gn("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Xn=RegExp.prototype.exec,Qn=String.prototype.replace,Zn=Xn,to=(Kn=/a/,Jn=/b*/g,Xn.call(Kn,"a"),Xn.call(Jn,"a"),0!==Kn.lastIndex||0!==Jn.lastIndex),eo=Yn.UNSUPPORTED_Y||Yn.BROKEN_CARET,io=void 0!==/()??/.exec("")[1];(to||io||eo)&&(Zn=function(t){var e,i,n,o,r=this,a=eo&&r.sticky,s=Wn.call(r),l=r.source,c=0,h=t;return a&&(-1===(s=s.replace("y","")).indexOf("g")&&(s+="g"),h=String(t).slice(r.lastIndex),r.lastIndex>0&&(!r.multiline||r.multiline&&"\n"!==t[r.lastIndex-1])&&(l="(?: "+l+")",h=" "+h,c++),i=new RegExp("^(?:"+l+")",s)),io&&(i=new RegExp("^"+l+"$(?!\\s)",s)),to&&(e=r.lastIndex),n=Xn.call(a?i:r,h),a?n?(n.input=n.input.slice(c),n[0]=n[0].slice(c),n.index=r.lastIndex,r.lastIndex+=n[0].length):r.lastIndex=0:to&&n&&(r.lastIndex=r.global?n.index+n[0].length:e),io&&n&&n.length>1&&Qn.call(n[0],i,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(n[o]=void 0)})),n});var no=Zn;Et({target:"RegExp",proto:!0,forced:/./.exec!==no},{exec:no});var oo=RegExp.prototype,ro=oo.toString,ao=r((function(){return"/a/b"!=ro.call({source:"a",flags:"b"})})),so="toString"!=ro.name;(ao||so)&&et(RegExp.prototype,"toString",(function(){var t=P(this),e=String(t.source),i=t.flags;return"/"+e+"/"+String(void 0===i&&t instanceof RegExp&&!("flags"in oo)?Wn.call(t):i)}),{unsafe:!0});var lo=Xt("match"),co=function(t){var e;return b(t)&&(void 0!==(e=t[lo])?!!e:"RegExp"==d(t))},ho=function(t){if(co(t))throw TypeError("The method doesn't accept regular expressions");return t},uo=Xt("match");Et({target:"String",proto:!0,forced:!function(t){var e=/./;try{"/./"[t](e)}catch(i){try{return e[uo]=!1,"/./"[t](e)}catch(t){}}return!1}("includes")},{includes:function(t){return!!~String(g(this)).indexOf(ho(t),arguments.length>1?arguments[1]:void 0)}});var fo=function(t){return function(e,i){var n,o,r=String(g(e)),a=st(i),s=r.length;return a<0||a>=s?t?"":void 0:(n=r.charCodeAt(a))<55296||n>56319||a+1===s||(o=r.charCodeAt(a+1))<56320||o>57343?t?r.charAt(a):n:t?r.slice(a,a+2):o-56320+(n-55296<<10)+65536}},po={codeAt:fo(!1),charAt:fo(!0)},go=po.charAt,vo=tt.set,bo=tt.getterFor("String Iterator");Li(String,"String",(function(t){vo(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=bo(this),i=e.string,n=e.index;return n>=i.length?{value:void 0,done:!0}:(t=go(i,n),e.index+=t.length,{value:t,done:!1})}));var mo=Xt("species"),yo=!r((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),wo="$0"==="a".replace(/./,"$0"),So=!r((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var i="ab".split(t);return 2!==i.length||"a"!==i[0]||"b"!==i[1]})),xo=function(t,e,i,n){var o=Xt(t),a=!r((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),s=a&&!r((function(){var e=!1,i=/a/;return"split"===t&&((i={}).constructor={},i.constructor[mo]=function(){return i},i.flags="",i[o]=/./[o]),i.exec=function(){return e=!0,null},i[o](""),!e}));if(!a||!s||"replace"===t&&(!yo||!wo)||"split"===t&&!So){var l=/./[o],c=i(o,""[t],(function(t,e,i,n,o){return e.exec===no?a&&!o?{done:!0,value:l.call(e,i,n)}:{done:!0,value:t.call(i,e,n)}:{done:!1}}),{REPLACE_KEEPS_$0:wo}),h=c[0],u=c[1];et(String.prototype,t,h),et(RegExp.prototype,o,2==e?function(t,e){return u.call(t,this,e)}:function(t){return u.call(t,this)})}n&&A(RegExp.prototype[o],"sham",!0)},ko=po.charAt,Oo=function(t,e,i){return e+(i?ko(t,e).length:1)},Co=function(t,e){var i=t.exec;if("function"==typeof i){var n=i.call(t,e);if("object"!=typeof n)throw TypeError("RegExp exec method returned something other than an Object or null");return n}if("RegExp"!==d(t))throw TypeError("RegExp#exec called on incompatible receiver");return no.call(t,e)},To=Math.max,Po=Math.min,$o=Math.floor,Io=/\$([$&'`]|\d\d?|<[^>]*>)/g,Ao=/\$([$&'`]|\d\d?)/g;xo("replace",2,(function(t,e,i,n){return[function(i,n){var o=g(this),r=null==i?void 0:i[t];return void 0!==r?r.call(i,o,n):e.call(String(o),i,n)},function(t,r){if(n.REPLACE_KEEPS_$0||"string"==typeof r&&-1===r.indexOf("$0")){var a=i(e,t,this,r);if(a.done)return a.value}var s=P(t),l=String(this),c="function"==typeof r;c||(r=String(r));var h=s.global;if(h){var u=s.unicode;s.lastIndex=0}for(var d=[];;){var f=Co(s,l);if(null===f)break;if(d.push(f),!h)break;""===String(f[0])&&(s.lastIndex=Oo(l,ct(s.lastIndex),u))}for(var p,g="",v=0,b=0;b<d.length;b++){f=d[b];for(var m=String(f[0]),y=To(Po(st(f.index),l.length),0),w=[],S=1;S<f.length;S++)w.push(void 0===(p=f[S])?p:String(p));var x=f.groups;if(c){var k=[m].concat(w,y,l);void 0!==x&&k.push(x);var O=String(r.apply(void 0,k))}else O=o(m,l,y,w,x,r);y>=v&&(g+=l.slice(v,y)+O,v=y+m.length)}return g+l.slice(v)}];function o(t,i,n,o,r,a){var s=n+t.length,l=o.length,c=Ao;return void 0!==r&&(r=Ft(r),c=Io),e.call(a,c,(function(e,a){var c;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return i.slice(0,n);case"'":return i.slice(s);case"<":c=r[a.slice(1,-1)];break;default:var h=+a;if(0===h)return e;if(h>l){var u=$o(h/10);return 0===u?e:u<=l?void 0===o[u-1]?a.charAt(1):o[u-1]+a.charAt(1):e}c=o[h-1]}return void 0===c?"":c}))}}));var Eo=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};xo("search",1,(function(t,e,i){return[function(e){var i=g(this),n=null==e?void 0:e[t];return void 0!==n?n.call(e,i):new RegExp(e)[t](String(i))},function(t){var n=i(e,t,this);if(n.done)return n.value;var o=P(t),r=String(this),a=o.lastIndex;Eo(a,0)||(o.lastIndex=0);var s=Co(o,r);return Eo(o.lastIndex,a)||(o.lastIndex=a),null===s?-1:s.index}]}));var Ro=Xt("species"),jo=[].push,No=Math.min,Fo=!r((function(){return!RegExp(4294967295,"y")}));xo("split",2,(function(t,e,i){var n;return n="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,i){var n=String(g(this)),o=void 0===i?4294967295:i>>>0;if(0===o)return[];if(void 0===t)return[n];if(!co(t))return e.call(n,t,o);for(var r,a,s,l=[],c=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,u=new RegExp(t.source,c+"g");(r=no.call(u,n))&&!((a=u.lastIndex)>h&&(l.push(n.slice(h,r.index)),r.length>1&&r.index<n.length&&jo.apply(l,r.slice(1)),s=r[0].length,h=a,l.length>=o));)u.lastIndex===r.index&&u.lastIndex++;return h===n.length?!s&&u.test("")||l.push(""):l.push(n.slice(h)),l.length>o?l.slice(0,o):l}:"0".split(void 0,0).length?function(t,i){return void 0===t&&0===i?[]:e.call(this,t,i)}:e,[function(e,i){var o=g(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,o,i):n.call(String(o),e,i)},function(t,o){var r=i(n,t,this,o,n!==e);if(r.done)return r.value;var a=P(t),s=String(this),l=function(t,e){var i,n=P(t).constructor;return void 0===n||null==(i=P(n)[Ro])?e:oe(i)}(a,RegExp),c=a.unicode,h=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Fo?"y":"g"),u=new l(Fo?a:"^(?:"+a.source+")",h),d=void 0===o?4294967295:o>>>0;if(0===d)return[];if(0===s.length)return null===Co(u,s)?[s]:[];for(var f=0,p=0,g=[];p<s.length;){u.lastIndex=Fo?p:0;var v,b=Co(u,Fo?s:s.slice(p));if(null===b||(v=No(ct(u.lastIndex+(Fo?0:p)),s.length))===f)p=Oo(s,p,c);else{if(g.push(s.slice(f,p)),g.length===d)return g;for(var m=1;m<=b.length-1;m++)if(g.push(b[m]),g.length===d)return g;p=f=v}}return g.push(s.slice(f)),g}]}),!Fo);var _o=pn.trim;Et({target:"String",proto:!0,forced:function(t){return r((function(){return!!cn[t]()||"​…᠎"!="​…᠎"[t]()||cn[t].name!==t}))}("trim")},{trim:function(){return _o(this)}});var Bo={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},Vo=ce.forEach,Lo=mi("forEach")?function(t){return Vo(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Do in Bo){var Ho=o[Do],Mo=Ho&&Ho.prototype;if(Mo&&Mo.forEach!==Lo)try{A(Mo,"forEach",Lo)}catch(t){Mo.forEach=Lo}}var Uo=Xt("iterator"),zo=Xt("toStringTag"),qo=Mi.values;for(var Wo in Bo){var Go=o[Wo],Ko=Go&&Go.prototype;if(Ko){if(Ko[Uo]!==qo)try{A(Ko,Uo,qo)}catch(t){Ko[Uo]=qo}if(Ko[zo]||A(Ko,zo,Wo),Bo[Wo])for(var Jo in Mi)if(Ko[Jo]!==Mi[Jo])try{A(Ko,Jo,Mi[Jo])}catch(t){Ko[Jo]=Mi[Jo]}}}function Yo(t){return(Yo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Xo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Qo(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function Zo(t,e,i){return e&&Qo(t.prototype,e),i&&Qo(t,i),t}function tr(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if(!(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t)))return;var i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done)&&(i.push(a.value),!e||i.length!==e);n=!0);}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return i}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function er(t){return function(t){if(Array.isArray(t)){for(var e=0,i=new Array(t.length);e<t.length;e++)i[e]=t[e];return i}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var ir=4;try{var nr=t.fn.dropdown.Constructor.VERSION;void 0!==nr&&(ir=parseInt(nr,10))}catch(t){}var or={3:{iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggleOff:"glyphicon-list-alt icon-list-alt",toggleOn:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus",fullscreen:"glyphicon-fullscreen",search:"glyphicon-search",clearSearch:"glyphicon-trash"},classes:{buttonsPrefix:"btn",buttons:"default",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"pull",inputGroup:"input-group",inputPrefix:"input-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],toolbarDropdownItem:'<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',toolbarDropdownSeparator:'<li class="divider"></li>',pageDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],pageDropdownItem:'<li role="menuitem" class="%s"><a href="#">%s</a></li>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<span class="input-group-btn">%s</span></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},4:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}}}[ir],rr={height:void 0,classes:"table table-bordered table-hover",theadClasses:"",headerStyle:function(t){return{}},rowStyle:function(t,e){return{}},rowAttributes:function(t,e){return{}},undefinedText:"-",locale:void 0,virtualScroll:!1,virtualScrollItemHeight:void 0,sortable:!0,sortClass:void 0,silentSort:!0,sortName:void 0,sortOrder:"asc",sortStable:!1,rememberOrder:!1,serverSort:!0,customSort:void 0,columns:[[]],data:[],url:void 0,method:"get",cache:!0,contentType:"application/json",dataType:"json",ajax:void 0,ajaxOptions:{},queryParams:function(t){return t},queryParamsType:"limit",responseHandler:function(t){return t},totalField:"total",totalNotFilteredField:"totalNotFiltered",dataField:"rows",pagination:!1,onlyInfoPagination:!1,showExtendedPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,totalNotFiltered:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"&lsaquo;",paginationNextText:"&rsaquo;",paginationSuccessivelySize:5,paginationPagesBySide:1,paginationUseIntermediate:!1,search:!1,searchOnEnterKey:!1,strictSearch:!1,visibleSearch:!1,showButtonIcons:!0,showButtonText:!1,showSearchButton:!1,showSearchClearButton:!1,trimOnSearch:!0,searchAlign:"right",searchTimeOut:500,searchText:"",customSearch:void 0,showHeader:!0,showFooter:!1,footerStyle:function(t){return{}},showColumns:!1,showColumnsToggleAll:!1,showColumnsSearch:!1,minimumCountColumns:1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,showFullscreen:!1,smartDisplay:!0,escape:!1,filterOptions:{filterAlgorithm:"and"},idField:void 0,selectItemName:"btSelectItem",clickToSelect:!1,ignoreClickToSelectOn:function(t){var e=t.tagName;return["A","BUTTON"].includes(e)},singleSelect:!1,checkboxHeader:!0,maintainMetaData:!1,multipleSelectRow:!1,uniqueId:void 0,cardView:!1,detailView:!1,detailViewIcon:!0,detailViewByClick:!1,detailFormatter:function(t,e){return""},detailFilter:function(t,e){return!0},toolbar:void 0,toolbarAlign:"left",buttonsToolbar:void 0,buttonsAlign:"right",buttonsOrder:["paginationSwitch","refresh","toggle","fullscreen","columns"],buttonsPrefix:or.classes.buttonsPrefix,buttonsClass:or.classes.buttons,icons:or.icons,html:or.html,iconSize:void 0,iconsPrefix:or.iconsPrefix,onAll:function(t,e){return!1},onClickCell:function(t,e,i,n){return!1},onDblClickCell:function(t,e,i,n){return!1},onClickRow:function(t,e){return!1},onDblClickRow:function(t,e){return!1},onSort:function(t,e){return!1},onCheck:function(t){return!1},onUncheck:function(t){return!1},onCheckAll:function(t){return!1},onUncheckAll:function(t){return!1},onCheckSome:function(t){return!1},onUncheckSome:function(t){return!1},onLoadSuccess:function(t){return!1},onLoadError:function(t){return!1},onColumnSwitch:function(t,e){return!1},onPageChange:function(t,e){return!1},onSearch:function(t){return!1},onToggle:function(t){return!1},onPreBody:function(t){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onPostFooter:function(){return!1},onExpandRow:function(t,e,i){return!1},onCollapseRow:function(t,e){return!1},onRefreshOptions:function(t){return!1},onRefresh:function(t){return!1},onResetView:function(){return!1},onScrollBody:function(){return!1}},ar={formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,e,i,n){return void 0!==n&&n>0&&n>i?"Showing ".concat(t," to ").concat(e," of ").concat(i," rows (filtered from ").concat(n," total rows)"):"Showing ".concat(t," to ").concat(e," of ").concat(i," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatSearch:function(){return"Search"},formatClearSearch:function(){return"Clear Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"}},sr={field:void 0,title:void 0,titleTooltip:void 0,class:void 0,width:void 0,widthUnit:"px",rowspan:void 0,colspan:void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,cellStyle:void 0,radio:!1,checkbox:!1,checkboxEnabled:!0,clickToSelect:!0,showSelectTitle:!1,sortable:!1,sortName:void 0,order:"asc",sorter:void 0,visible:!0,switchable:!0,cardVisible:!0,searchable:!0,formatter:void 0,footerFormatter:void 0,detailFormatter:void 0,searchFormatter:!0,escape:!1,events:void 0};Object.assign(rr,ar);var lr={VERSION:"1.16.0",THEME:"bootstrap".concat(ir),CONSTANTS:or,DEFAULTS:rr,COLUMN_DEFAULTS:sr,METHODS:["getOptions","refreshOptions","getData","getSelections","getAllSelections","load","append","prepend","remove","removeAll","insertRow","updateRow","getRowByUniqueId","updateByUniqueId","removeByUniqueId","updateCell","updateCellByUniqueId","showRow","hideRow","getHiddenRows","showColumn","hideColumn","getVisibleColumns","getHiddenColumns","showAllColumns","hideAllColumns","mergeCells","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","destroy","resetView","showLoading","hideLoading","togglePagination","toggleFullscreen","toggleView","resetSearch","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","toggleDetailView","expandRow","collapseRow","expandAllRows","collapseAllRows","updateColumnTitle","updateFormatText"],EVENTS:{"all.bs.table":"onAll","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","post-footer.bs.table":"onPostFooter","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh","scroll-body.bs.table":"onScrollBody"},LOCALES:{en:ar,"en-US":ar}},cr=r((function(){_t(1)}));Et({target:"Object",stat:!0,forced:cr},{keys:function(t){return _t(Ft(t))}});var hr={sprintf:function(t){for(var e=arguments.length,i=new Array(e>1?e-1:0),n=1;n<e;n++)i[n-1]=arguments[n];var o=!0,r=0,a=t.replace(/%s/g,(function(){var t=i[r++];return void 0===t?(o=!1,""):t}));return o?a:""},isEmptyObject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return 0===Object.entries(t).length&&t.constructor===Object},isNumeric:function(t){return!isNaN(parseFloat(t))&&isFinite(t)},getFieldTitle:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(s.field===e)return s.title}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return""},setFieldIndex:function(t){var e=0,i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[0][Symbol.iterator]();!(n=(a=s.next()).done);n=!0){e+=a.value.colspan||1}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}for(var l=0;l<t.length;l++){i[l]=[];for(var c=0;c<e;c++)i[l][c]=!1}for(var h=0;h<t.length;h++){var u=!0,d=!1,f=void 0;try{for(var p,g=t[h][Symbol.iterator]();!(u=(p=g.next()).done);u=!0){var v=p.value,b=v.rowspan||1,m=v.colspan||1,y=i[h].indexOf(!1);v.colspanIndex=y,1===m?(v.fieldIndex=y,void 0===v.field&&(v.field=y)):v.colspanGroup=v.colspan;for(var w=0;w<b;w++)i[h+w][y]=!0;for(var S=0;S<m;S++)i[h][y+S]=!0}}catch(t){d=!0,f=t}finally{try{u||null==g.return||g.return()}finally{if(d)throw f}}}},updateFieldGroup:function(t){var e,i=(e=[]).concat.apply(e,er(t)),n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value,c=!0,h=!1,u=void 0;try{for(var d,f=l[Symbol.iterator]();!(c=(d=f.next()).done);c=!0){var p=d.value;if(p.colspanGroup>1){for(var g=0,v=function(t){i.find((function(e){return e.fieldIndex===t})).visible&&g++},b=p.colspanIndex;b<p.colspanIndex+p.colspanGroup;b++)v(b);p.colspan=g,p.visible=g>0}}}catch(t){h=!0,u=t}finally{try{c||null==f.return||f.return()}finally{if(h)throw u}}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}},getScrollBarWidth:function(){if(void 0===this.cachedWidth){var e=t("<div/>").addClass("fixed-table-scroll-inner"),i=t("<div/>").addClass("fixed-table-scroll-outer");i.append(e),t("body").append(i);var n=e[0].offsetWidth;i.css("overflow","scroll");var o=e[0].offsetWidth;n===o&&(o=i[0].clientWidth),i.remove(),this.cachedWidth=n-o}return this.cachedWidth},calculateObjectValue:function(t,e,i,n){var o=e;if("string"==typeof e){var r=e.split(".");if(r.length>1){o=window;var a=!0,s=!1,l=void 0;try{for(var c,h=r[Symbol.iterator]();!(a=(c=h.next()).done);a=!0){o=o[c.value]}}catch(t){s=!0,l=t}finally{try{a||null==h.return||h.return()}finally{if(s)throw l}}}else o=window[e]}return null!==o&&"object"===Yo(o)?o:"function"==typeof o?o.apply(t,i||[]):!o&&"string"==typeof e&&this.sprintf.apply(this,[e].concat(er(i)))?this.sprintf.apply(this,[e].concat(er(i))):n},compareObjects:function(t,e,i){var n=Object.keys(t),o=Object.keys(e);if(i&&n.length!==o.length)return!1;for(var r=0,a=n;r<a.length;r++){var s=a[r];if(o.includes(s)&&t[s]!==e[s])return!1}return!0},escapeHTML:function(t){return"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#039;").replace(/`/g,"&#x60;"):t},getRealDataAttr:function(t){for(var e=0,i=Object.entries(t);e<i.length;e++){var n=tr(i[e],2),o=n[0],r=n[1],a=o.split(/(?=[A-Z])/).join("-").toLowerCase();a!==o&&(t[a]=r,delete t[o])}return t},getItemField:function(t,e,i){var n=t;if("string"!=typeof e||t.hasOwnProperty(e))return i?this.escapeHTML(t[e]):t[e];var o=e.split("."),r=!0,a=!1,s=void 0;try{for(var l,c=o[Symbol.iterator]();!(r=(l=c.next()).done);r=!0){var h=l.value;n=n&&n[h]}}catch(t){a=!0,s=t}finally{try{r||null==c.return||c.return()}finally{if(a)throw s}}return i?this.escapeHTML(n):n},isIEBrowser:function(){return navigator.userAgent.includes("MSIE ")||/Trident.*rv:11\./.test(navigator.userAgent)},findIndex:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(JSON.stringify(s)===JSON.stringify(e))return t.indexOf(s)}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return-1},trToData:function(e,i){var n=this,o=[],r=[];return i.each((function(i,a){var s={};s._id=t(a).attr("id"),s._class=t(a).attr("class"),s._data=n.getRealDataAttr(t(a).data()),t(a).find(">td,>th").each((function(o,a){for(var l=+t(a).attr("colspan")||1,c=+t(a).attr("rowspan")||1,h=o;r[i]&&r[i][h];h++);for(var u=h;u<h+l;u++)for(var d=i;d<i+c;d++)r[d]||(r[d]=[]),r[d][u]=!0;var f=e[h].field;s[f]=t(a).html().trim(),s["_".concat(f,"_id")]=t(a).attr("id"),s["_".concat(f,"_class")]=t(a).attr("class"),s["_".concat(f,"_rowspan")]=t(a).attr("rowspan"),s["_".concat(f,"_colspan")]=t(a).attr("colspan"),s["_".concat(f,"_title")]=t(a).attr("title"),s["_".concat(f,"_data")]=n.getRealDataAttr(t(a).data())})),o.push(s)})),o},sort:function(t,e,i,n,o,r){return null==t&&(t=""),null==e&&(e=""),n&&t===e&&(t=o,e=r),this.isNumeric(t)&&this.isNumeric(e)?(t=parseFloat(t))<(e=parseFloat(e))?-1*i:t>e?i:0:t===e?0:("string"!=typeof t&&(t=t.toString()),-1===t.localeCompare(e)?-1*i:i)},getResizeEventName:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return t=t||"".concat(+new Date).concat(~~(1e6*Math.random())),"resize.bootstrap-table-".concat(t)}},ur=function(){function t(e){var i=this;Xo(this,t),this.rows=e.rows,this.scrollEl=e.scrollEl,this.contentEl=e.contentEl,this.callback=e.callback,this.itemHeight=e.itemHeight,this.cache={},this.scrollTop=this.scrollEl.scrollTop,this.initDOM(this.rows,e.fixedScroll),this.scrollEl.scrollTop=this.scrollTop,this.lastCluster=0;var n=function(){i.lastCluster!==(i.lastCluster=i.getNum())&&(i.initDOM(i.rows),i.callback())};this.scrollEl.addEventListener("scroll",n,!1),this.destroy=function(){i.contentEl.innerHtml="",i.scrollEl.removeEventListener("scroll",n,!1)}}return Zo(t,[{key:"initDOM",value:function(t,e){void 0===this.clusterHeight&&(this.cache.scrollTop=this.scrollEl.scrollTop,this.cache.data=this.contentEl.innerHTML=t[0]+t[0]+t[0],this.getRowsHeight(t));var i=this.initData(t,this.getNum(e)),n=i.rows.join(""),o=this.checkChanges("data",n),r=this.checkChanges("top",i.topOffset),a=this.checkChanges("bottom",i.bottomOffset),s=[];o&&r?(i.topOffset&&s.push(this.getExtra("top",i.topOffset)),s.push(n),i.bottomOffset&&s.push(this.getExtra("bottom",i.bottomOffset)),this.contentEl.innerHTML=s.join(""),e&&(this.contentEl.scrollTop=this.cache.scrollTop)):a&&(this.contentEl.lastChild.style.height="".concat(i.bottomOffset,"px"))}},{key:"getRowsHeight",value:function(){if(void 0===this.itemHeight){var t=this.contentEl.children,e=t[Math.floor(t.length/2)];this.itemHeight=e.offsetHeight}this.blockHeight=50*this.itemHeight,this.clusterRows=200,this.clusterHeight=4*this.blockHeight}},{key:"getNum",value:function(t){return this.scrollTop=t?this.cache.scrollTop:this.scrollEl.scrollTop,Math.floor(this.scrollTop/(this.clusterHeight-this.blockHeight))||0}},{key:"initData",value:function(t,e){if(t.length<50)return{topOffset:0,bottomOffset:0,rowsAbove:0,rows:t};var i=Math.max((this.clusterRows-50)*e,0),n=i+this.clusterRows,o=Math.max(i*this.itemHeight,0),r=Math.max((t.length-n)*this.itemHeight,0),a=[],s=i;o<1&&s++;for(var l=i;l<n;l++)t[l]&&a.push(t[l]);return{topOffset:o,bottomOffset:r,rowsAbove:s,rows:a}}},{key:"checkChanges",value:function(t,e){var i=e!==this.cache[t];return this.cache[t]=e,i}},{key:"getExtra",value:function(t,e){var i=document.createElement("tr");return i.className="virtual-scroll-".concat(t),e&&(i.style.height="".concat(e,"px")),i.outerHTML}}]),t}(),dr=function(){function e(i,n){Xo(this,e),this.options=n,this.$el=t(i),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0,this.init()}return Zo(e,[{key:"init",value:function(){this.initConstants(),this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()}},{key:"initConstants",value:function(){var e=this.options;this.constants=lr.CONSTANTS,this.constants.theme=t.fn.bootstrapTable.theme;var i=e.buttonsPrefix?"".concat(e.buttonsPrefix,"-"):"";this.constants.buttonsClass=[e.buttonsPrefix,i+e.buttonsClass,hr.sprintf("".concat(i,"%s"),e.iconSize)].join(" ").trim()}},{key:"initLocale",value:function(){if(this.options.locale){var e=t.fn.bootstrapTable.locales,i=this.options.locale.split(/-|_/);i[0]=i[0].toLowerCase(),i[1]&&(i[1]=i[1].toUpperCase()),e[this.options.locale]?t.extend(this.options,e[this.options.locale]):e[i.join("-")]?t.extend(this.options,e[i.join("-")]):e[i[0]]&&t.extend(this.options,e[i[0]])}}},{key:"initContainer",value:function(){var e=["top","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination clearfix"></div>':"",i=["bottom","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination"></div>':"";this.$container=t('\n      <div class="bootstrap-table '.concat(this.constants.theme,'">\n      <div class="fixed-table-toolbar"></div>\n      ').concat(e,'\n      <div class="fixed-table-container">\n      <div class="fixed-table-header"><table></table></div>\n      <div class="fixed-table-body">\n      <div class="fixed-table-loading">\n      <span class="loading-wrap">\n      <span class="loading-text">').concat(this.options.formatLoadingMessage(),'</span>\n      <span class="animation-wrap"><span class="animation-dot"></span></span>\n      </span>\n      </div>\n      </div>\n      <div class="fixed-table-footer"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ').concat(i,"\n      </div>\n    ")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$el.find("tfoot"),this.options.buttonsToolbar?this.$toolbar=t("body").find(this.options.buttonsToolbar):this.$toolbar=this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.$tableLoading.addClass(this.options.classes),this.options.height&&(this.$tableContainer.addClass("fixed-height"),this.options.showFooter&&this.$tableContainer.addClass("has-footer"),this.options.classes.split(" ").includes("table-bordered")&&(this.$tableBody.append('<div class="fixed-table-border"></div>'),this.$tableBorder=this.$tableBody.find(".fixed-table-border"),this.$tableLoading.addClass("fixed-table-border")),this.$tableFooter=this.$container.find(".fixed-table-footer"))}},{key:"initTable",value:function(){var i=this,n=[];this.$header=this.$el.find(">thead"),this.$header.length?this.options.theadClasses&&this.$header.addClass(this.options.theadClasses):this.$header=t('<thead class="'.concat(this.options.theadClasses,'"></thead>')).appendTo(this.$el),this.$header.find("tr").each((function(e,i){var o=[];t(i).find("th").each((function(e,i){void 0!==t(i).data("field")&&t(i).data("field","".concat(t(i).data("field"))),o.push(t.extend({},{title:t(i).html(),class:t(i).attr("class"),titleTooltip:t(i).attr("title"),rowspan:t(i).attr("rowspan")?+t(i).attr("rowspan"):void 0,colspan:t(i).attr("colspan")?+t(i).attr("colspan"):void 0},t(i).data()))})),n.push(o)})),Array.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=t.extend(!0,[],n,this.options.columns),this.columns=[],this.fieldsColumnsIndex=[],hr.setFieldIndex(this.options.columns),this.options.columns.forEach((function(n,o){n.forEach((function(n,r){var a=t.extend({},e.COLUMN_DEFAULTS,n);void 0!==a.fieldIndex&&(i.columns[a.fieldIndex]=a,i.fieldsColumnsIndex[a.field]=a.fieldIndex),i.options.columns[o][r]=a}))})),this.options.data.length||(this.options.data=hr.trToData(this.columns,this.$el.find(">tbody>tr")),this.options.data.length&&(this.fromHtml=!0)),this.footerData=hr.trToData(this.columns,this.$el.find(">tfoot>tr")),this.footerData&&this.$el.find("tfoot").html("<tr></tr>"),!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()}},{key:"initHeader",value:function(){var e=this,i={},n=[];this.header={fields:[],styles:[],classes:[],formatters:[],detailFormatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},hr.updateFieldGroup(this.options.columns),this.options.columns.forEach((function(t,o){n.push("<tr>"),0===o&&!e.options.cardView&&e.options.detailView&&e.options.detailViewIcon&&n.push('<th class="detail" rowspan="'.concat(e.options.columns.length,'">\n          <div class="fht-cell"></div>\n          </th>\n        ')),t.forEach((function(t,r){var a=hr.sprintf(' class="%s"',t.class),s=t.widthUnit,l=parseFloat(t.width),c=hr.sprintf("text-align: %s; ",t.halign?t.halign:t.align),h=hr.sprintf("text-align: %s; ",t.align),u=hr.sprintf("vertical-align: %s; ",t.valign);if(u+=hr.sprintf("width: %s; ",!t.checkbox&&!t.radio||l?l?l+s:void 0:t.showSelectTitle?void 0:"36px"),void 0!==t.fieldIndex||t.visible){var d=hr.calculateObjectValue(null,e.options.headerStyle,[t]),f=[],p="";if(d&&d.css)for(var g=0,v=Object.entries(d.css);g<v.length;g++){var b=tr(v[g],2),m=b[0],y=b[1];f.push("".concat(m,": ").concat(y))}if(d&&d.classes&&(p=hr.sprintf(' class="%s"',t.class?[t.class,d.classes].join(" "):d.classes)),void 0!==t.fieldIndex){if(e.header.fields[t.fieldIndex]=t.field,e.header.styles[t.fieldIndex]=h+u,e.header.classes[t.fieldIndex]=a,e.header.formatters[t.fieldIndex]=t.formatter,e.header.detailFormatters[t.fieldIndex]=t.detailFormatter,e.header.events[t.fieldIndex]=t.events,e.header.sorters[t.fieldIndex]=t.sorter,e.header.sortNames[t.fieldIndex]=t.sortName,e.header.cellStyles[t.fieldIndex]=t.cellStyle,e.header.searchables[t.fieldIndex]=t.searchable,!t.visible)return;if(e.options.cardView&&!t.cardVisible)return;i[t.field]=t}n.push("<th".concat(hr.sprintf(' title="%s"',t.titleTooltip)),t.checkbox||t.radio?hr.sprintf(' class="bs-checkbox %s"',t.class||""):p||a,hr.sprintf(' style="%s"',c+u+f.join("; ")),hr.sprintf(' rowspan="%s"',t.rowspan),hr.sprintf(' colspan="%s"',t.colspan),hr.sprintf(' data-field="%s"',t.field),0===r&&o>0?" data-not-first-th":"",">"),n.push(hr.sprintf('<div class="th-inner %s">',e.options.sortable&&t.sortable?"sortable both":""));var w=e.options.escape?hr.escapeHTML(t.title):t.title,S=w;t.checkbox&&(w="",!e.options.singleSelect&&e.options.checkboxHeader&&(w='<label><input name="btSelectAll" type="checkbox" /><span></span></label>'),e.header.stateField=t.field),t.radio&&(w="",e.header.stateField=t.field),!w&&t.showSelectTitle&&(w+=S),n.push(w),n.push("</div>"),n.push('<div class="fht-cell"></div>'),n.push("</div>"),n.push("</th>")}})),n.push("</tr>")})),this.$header.html(n.join("")),this.$header.find("th[data-field]").each((function(e,n){t(n).data(i[t(n).data("field")])})),this.$container.off("click",".th-inner").on("click",".th-inner",(function(i){var n=t(i.currentTarget);if(e.options.detailView&&!n.parent().hasClass("bs-checkbox")&&n.closest(".bootstrap-table")[0]!==e.$container[0])return!1;e.options.sortable&&n.parent().data().sortable&&e.onSort(i)})),this.$header.children().children().off("keypress").on("keypress",(function(i){e.options.sortable&&t(i.currentTarget).data().sortable&&(13===(i.keyCode||i.which)&&e.onSort(i))}));var o=hr.getResizeEventName(this.$el.attr("id"));t(window).off(o),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),t(window).on(o,(function(){return e.resetView()}))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",(function(i){i.stopPropagation();var n=t(i.currentTarget).prop("checked");e[n?"checkAll":"uncheckAll"](),e.updateSelected()}))}},{key:"initData",value:function(t,e){this.options.data="append"===e?this.options.data.concat(t):"prepend"===e?[].concat(t).concat(this.options.data):t||this.options.data,this.data=this.options.data,"server"!==this.options.sidePagination&&this.initSort()}},{key:"initSort",value:function(){var t=this,e=this.options.sortName,i="desc"===this.options.sortOrder?-1:1,n=this.header.fields.indexOf(this.options.sortName),o=0;-1!==n&&(this.options.sortStable&&this.data.forEach((function(t,e){t.hasOwnProperty("_position")||(t._position=e)})),this.options.customSort?hr.calculateObjectValue(this.options,this.options.customSort,[this.options.sortName,this.options.sortOrder,this.data]):this.data.sort((function(o,r){t.header.sortNames[n]&&(e=t.header.sortNames[n]);var a=hr.getItemField(o,e,t.options.escape),s=hr.getItemField(r,e,t.options.escape),l=hr.calculateObjectValue(t.header,t.header.sorters[n],[a,s,o,r]);return void 0!==l?t.options.sortStable&&0===l?i*(o._position-r._position):i*l:hr.sort(a,s,i,t.options.sortStable,o._position,r._position)})),void 0!==this.options.sortClass&&(clearTimeout(o),o=setTimeout((function(){t.$el.removeClass(t.options.sortClass);var e=t.$header.find('[data-field="'.concat(t.options.sortName,'"]')).index();t.$el.find("tr td:nth-child(".concat(e+1,")")).addClass(t.options.sortClass)}),250)))}},{key:"onSort",value:function(e){var i=e.type,n=e.currentTarget,o="keypress"===i?t(n):t(n).parent(),r=this.$header.find("th").eq(o.index());if(this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===o.data("field")?this.options.sortOrder="asc"===this.options.sortOrder?"desc":"asc":(this.options.sortName=o.data("field"),this.options.rememberOrder?this.options.sortOrder="asc"===o.data("order")?"desc":"asc":this.options.sortOrder=this.columns[this.fieldsColumnsIndex[o.data("field")]].sortOrder||this.columns[this.fieldsColumnsIndex[o.data("field")]].order),this.trigger("sort",this.options.sortName,this.options.sortOrder),o.add(r).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination&&this.options.serverSort)return this.options.pageNumber=1,void this.initServer(this.options.silentSort);this.initSort(),this.initBody()}},{key:"initToolbar",value:function(){var e,i=this,n=this.options,o=[],r=0,a=0;this.$toolbar.find(".bs-bars").children().length&&t("body").append(t(n.toolbar)),this.$toolbar.html(""),"string"!=typeof n.toolbar&&"object"!==Yo(n.toolbar)||t(hr.sprintf('<div class="bs-bars %s-%s"></div>',this.constants.classes.pull,n.toolbarAlign)).appendTo(this.$toolbar).append(t(n.toolbar)),o=['<div class="'.concat(["columns","columns-".concat(n.buttonsAlign),this.constants.classes.buttonsGroup,"".concat(this.constants.classes.pull,"-").concat(n.buttonsAlign)].join(" "),'">')],"string"==typeof n.icons&&(n.icons=hr.calculateObjectValue(null,n.icons));var s={paginationSwitch:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="paginationSwitch"\n        aria-label="Pagination Switch" title="').concat(n.formatPaginationSwitch(),'">\n        ').concat(n.showButtonIcons?hr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.paginationSwitchDown):"","\n        ").concat(n.showButtonText?n.formatPaginationSwitchUp():"","\n        </button>"),refresh:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="refresh"\n        aria-label="Refresh" title="').concat(n.formatRefresh(),'">\n        ').concat(n.showButtonIcons?hr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.refresh):"","\n        ").concat(n.showButtonText?n.formatRefresh():"","\n        </button>"),toggle:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="toggle"\n        aria-label="Toggle" title="').concat(n.formatToggle(),'">\n        ').concat(n.showButtonIcons?hr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.toggleOff):"","\n        ").concat(n.showButtonText?n.formatToggleOn():"","\n        </button>"),fullscreen:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="fullscreen"\n        aria-label="Fullscreen" title="').concat(n.formatFullscreen(),'">\n        ').concat(n.showButtonIcons?hr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.fullscreen):"","\n        ").concat(n.showButtonText?n.formatFullscreen():"","\n        </button>"),columns:function(){var t=[];if(t.push('<div class="keep-open '.concat(i.constants.classes.buttonsDropdown,'" title="').concat(n.formatColumns(),'">\n          <button class="').concat(i.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown"\n          aria-label="Columns" title="').concat(n.formatColumns(),'">\n          ').concat(n.showButtonIcons?hr.sprintf(i.constants.html.icon,n.iconsPrefix,n.icons.columns):"","\n          ").concat(n.showButtonText?n.formatColumns():"","\n          ").concat(i.constants.html.dropdownCaret,"\n          </button>\n          ").concat(i.constants.html.toolbarDropdown[0])),n.showColumnsSearch&&(t.push(hr.sprintf(i.constants.html.toolbarDropdownItem,hr.sprintf('<input type="text" class="%s" id="columnsSearch" placeholder="%s" autocomplete="off">',i.constants.classes.input,n.formatSearch()))),t.push(i.constants.html.toolbarDropdownSeparator)),n.showColumnsToggleAll){var e=i.getVisibleColumns().length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length;t.push(hr.sprintf(i.constants.html.toolbarDropdownItem,hr.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>',e?'checked="checked"':"",n.formatColumnsToggleAll()))),t.push(i.constants.html.toolbarDropdownSeparator)}var o=0;return i.columns.forEach((function(t,e){t.visible&&o++})),i.columns.forEach((function(e,r){if(!i.isSelectionColumn(e)&&(!n.cardView||e.cardVisible)){var s=e.visible?' checked="checked"':"",l=o<=i.options.minimumCountColumns&&s?' disabled="disabled"':"";e.switchable&&(t.push(hr.sprintf(i.constants.html.toolbarDropdownItem,hr.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>',e.field,r,s,l,e.title))),a++)}})),t.push(i.constants.html.toolbarDropdown[1],"</div>"),t.join("")}()};"string"==typeof n.buttonsOrder&&(n.buttonsOrder=n.buttonsOrder.replace(/\[|\]| |'/g,"").toLowerCase().split(","));var l=!0,c=!1,h=void 0;try{for(var u,d=n.buttonsOrder[Symbol.iterator]();!(l=(u=d.next()).done);l=!0){var f=u.value;n["show"+f.charAt(0).toUpperCase()+f.substring(1)]&&o.push(s[f])}}catch(t){c=!0,h=t}finally{try{l||null==d.return||d.return()}finally{if(c)throw h}}if(o.push("</div>"),(this.showToolbar||o.length>2)&&this.$toolbar.append(o.join("")),n.showPaginationSwitch&&this.$toolbar.find('button[name="paginationSwitch"]').off("click").on("click",(function(){return i.togglePagination()})),n.showFullscreen&&this.$toolbar.find('button[name="fullscreen"]').off("click").on("click",(function(){return i.toggleFullscreen()})),n.showRefresh&&this.$toolbar.find('button[name="refresh"]').off("click").on("click",(function(){return i.refresh()})),n.showToggle&&this.$toolbar.find('button[name="toggle"]').off("click").on("click",(function(){i.toggleView()})),n.showColumns){var p=(e=this.$toolbar.find(".keep-open")).find('input[type="checkbox"]:not(".toggle-all")'),g=e.find('input[type="checkbox"].toggle-all');if(a<=n.minimumCountColumns&&e.find("input").prop("disabled",!0),e.find("li, label").off("click").on("click",(function(t){t.stopImmediatePropagation()})),p.off("click").on("click",(function(e){var n=e.currentTarget,o=t(n);i._toggleColumn(o.val(),o.prop("checked"),!1),i.trigger("column-switch",o.data("field"),o.prop("checked")),g.prop("checked",p.filter(":checked").length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length)})),g.off("click").on("click",(function(e){var n=e.currentTarget;i._toggleAllColumns(t(n).prop("checked"))})),n.showColumnsSearch){var v=e.find("#columnsSearch"),b=e.find(".dropdown-item-marker");v.on("keyup paste change",(function(e){var i=e.currentTarget,n=t(i).val().toLowerCase();b.show(),p.each((function(e,i){var o=t(i).parents(".dropdown-item-marker");o.text().toLowerCase().includes(n)||o.hide()}))}))}}if(n.search||this.showSearchClearButton){o=[];var m=hr.sprintf(this.constants.html.searchButton,this.constants.buttonsClass,n.formatSearch(),n.showButtonIcons?hr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.search):"",n.showButtonText?n.formatSearch():""),y=hr.sprintf(this.constants.html.searchClearButton,this.constants.buttonsClass,n.formatClearSearch(),n.showButtonIcons?hr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.clearSearch):"",n.showButtonText?n.formatClearSearch():""),w='<input class="'.concat(this.constants.classes.input,"\n        ").concat(hr.sprintf(" %s%s",this.constants.classes.inputPrefix,n.iconSize),'\n        search-input" type="text" placeholder="').concat(n.formatSearch(),'" autocomplete="off">'),S=w;if(n.showSearchButton||n.showSearchClearButton){var x=(n.showSearchButton?m:"")+(n.showSearchClearButton?y:"");S=n.search?hr.sprintf(this.constants.html.inputGroup,w,x):x}o.push(hr.sprintf('\n        <div class="'.concat(this.constants.classes.pull,"-").concat(n.searchAlign," search ").concat(this.constants.classes.inputGroup,'">\n          %s\n        </div>\n      '),S)),this.$toolbar.append(o.join(""));var k=this.$toolbar.find(".search input"),O=function(){var t="keyup drop blur ".concat(hr.isIEBrowser()?"mouseup":"");k.off(t).on(t,(function(t){n.searchOnEnterKey&&13!==t.keyCode||[37,38,39,40].includes(t.keyCode)||(clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:t.currentTarget})}),n.searchTimeOut))}))};n.showSearchButton?(this.$toolbar.find(".search button[name=search]").off("click").on("click",(function(t){clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:k})}),n.searchTimeOut)})),n.searchOnEnterKey&&O()):O(),n.showSearchClearButton&&this.$toolbar.find(".search button[name=clearSearch]").click((function(){i.resetSearch()}))}}},{key:"onSearch",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=e.currentTarget,n=e.firedByInitSearchText,o=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(void 0!==i&&t(i).length&&o){var r=t(i).val().trim();if(this.options.trimOnSearch&&t(i).val()!==r&&t(i).val(r),this.searchText===r&&r.length>0)return;t(i).hasClass("search-input")&&(this.searchText=r,this.options.searchText=r)}n||(this.options.pageNumber=1),this.initSearch(),n?"client"===this.options.sidePagination&&this.updatePagination():this.updatePagination(),this.trigger("search",this.searchText)}},{key:"initSearch",value:function(){var t=this;if(this.filterOptions=this.filterOptions||this.options.filterOptions,"server"!==this.options.sidePagination){if(this.options.customSearch)return void(this.data=hr.calculateObjectValue(this.options,this.options.customSearch,[this.options.data,this.searchText,this.filterColumns]));var e=this.searchText&&(this.fromHtml?hr.escapeHTML(this.searchText):this.searchText).toLowerCase(),i=hr.isEmptyObject(this.filterColumns)?null:this.filterColumns;"function"==typeof this.filterOptions.filterAlgorithm?this.data=this.options.data.filter((function(e,n){return t.filterOptions.filterAlgorithm.apply(null,[e,i])})):"string"==typeof this.filterOptions.filterAlgorithm&&(this.data=i?this.options.data.filter((function(e,n){var o=t.filterOptions.filterAlgorithm;if("and"===o){for(var r in i)if(Array.isArray(i[r])&&!i[r].includes(e[r])||!Array.isArray(i[r])&&e[r]!==i[r])return!1}else if("or"===o){var a=!1;for(var s in i)(Array.isArray(i[s])&&i[s].includes(e[s])||!Array.isArray(i[s])&&e[s]===i[s])&&(a=!0);return a}return!0})):this.options.data);var n=this.getVisibleFields();this.data=e?this.data.filter((function(i,o){for(var r=0;r<t.header.fields.length;r++)if(t.header.searchables[r]&&(!t.options.visibleSearch||-1!==n.indexOf(t.header.fields[r]))){var a=hr.isNumeric(t.header.fields[r])?parseInt(t.header.fields[r],10):t.header.fields[r],s=t.columns[t.fieldsColumnsIndex[a]],l=void 0;if("string"==typeof a){l=i;for(var c=a.split("."),h=0;h<c.length;h++)null!==l[c[h]]&&(l=l[c[h]])}else l=i[a];if(s&&s.searchFormatter&&(l=hr.calculateObjectValue(s,t.header.formatters[r],[l,i,o,s.field],l)),"string"==typeof l||"number"==typeof l)if(t.options.strictSearch){if("".concat(l).toLowerCase()===e)return!0}else{var u=/(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm.exec(e),d=!1;if(u){var f=u[1]||"".concat(u[5],"l"),p=u[2]||u[3],g=parseInt(l,10),v=parseInt(p,10);switch(f){case">":case"<l":d=g>v;break;case"<":case">l":d=g<v;break;case"<=":case"=<":case">=l":case"=>l":d=g<=v;break;case">=":case"=>":case"<=l":case"=<l":d=g>=v}}if(d||"".concat(l).toLowerCase().includes(e))return!0}}return!1})):this.data}this.initSort()}},{key:"initPagination",value:function(){var t=this,e=this.options;if(e.pagination){this.$pagination.show();var i,n,o,r,a,s,l,c=[],h=!1,u=this.getData({includeHiddenRows:!1}),d=e.pageList;"string"==typeof d&&(d=d.replace(/\[|\]| /g,"").toLowerCase().split(",")),d=d.map((function(t){return"string"==typeof t?t.toLowerCase()===e.formatAllRows().toLowerCase()||["all","unlimited"].includes(t.toLowerCase())?e.formatAllRows():+t:t})),"server"!==e.sidePagination&&(e.totalRows=u.length),this.totalPages=0,e.totalRows&&(e.pageSize===e.formatAllRows()&&(e.pageSize=e.totalRows,h=!0),this.totalPages=1+~~((e.totalRows-1)/e.pageSize),e.totalPages=this.totalPages),this.totalPages>0&&e.pageNumber>this.totalPages&&(e.pageNumber=this.totalPages),this.pageFrom=(e.pageNumber-1)*e.pageSize+1,this.pageTo=e.pageNumber*e.pageSize,this.pageTo>e.totalRows&&(this.pageTo=e.totalRows),this.options.pagination&&"server"!==this.options.sidePagination&&(this.options.totalNotFiltered=this.options.data.length),this.options.showExtendedPagination||(this.options.totalNotFiltered=void 0);var f=e.onlyInfoPagination?e.formatDetailPagination(e.totalRows):e.formatShowingRows(this.pageFrom,this.pageTo,e.totalRows,e.totalNotFiltered);if(c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationDetailHAlign,' pagination-detail">\n      <span class="pagination-info">\n      ').concat(f,"\n      </span>")),!e.onlyInfoPagination){c.push('<span class="page-list">');var p=['<span class="'.concat(this.constants.classes.paginationDropdown,'">\n        <button class="').concat(this.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown">\n        <span class="page-size">\n        ').concat(h?e.formatAllRows():e.pageSize,"\n        </span>\n        ").concat(this.constants.html.dropdownCaret,"\n        </button>\n        ").concat(this.constants.html.pageDropdown[0])];d.forEach((function(i,n){var o;(!e.smartDisplay||0===n||d[n-1]<e.totalRows)&&(o=h?i===e.formatAllRows()?t.constants.classes.dropdownActive:"":i===e.pageSize?t.constants.classes.dropdownActive:"",p.push(hr.sprintf(t.constants.html.pageDropdownItem,o,i)))})),p.push("".concat(this.constants.html.pageDropdown[1],"</span>")),c.push(e.formatRecordsPerPage(p.join(""))),c.push("</span></div>"),c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationHAlign,' pagination">'),hr.sprintf(this.constants.html.pagination[0],hr.sprintf(" pagination-%s",e.iconSize)),hr.sprintf(this.constants.html.paginationItem," page-pre",e.formatSRPaginationPreText(),e.paginationPreText)),this.totalPages<e.paginationSuccessivelySize?(n=1,o=this.totalPages):o=(n=e.pageNumber-e.paginationPagesBySide)+2*e.paginationPagesBySide,e.pageNumber<e.paginationSuccessivelySize-1&&(o=e.paginationSuccessivelySize),e.paginationSuccessivelySize>this.totalPages-n&&(n=n-(e.paginationSuccessivelySize-(this.totalPages-n))+1),n<1&&(n=1),o>this.totalPages&&(o=this.totalPages);var g=Math.round(e.paginationPagesBySide/2),v=function(i){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return hr.sprintf(t.constants.html.paginationItem,n+(i===e.pageNumber?" ".concat(t.constants.classes.paginationActive):""),e.formatSRPaginationPageText(i),i)};if(n>1){var b=e.paginationPagesBySide;for(b>=n&&(b=n-1),i=1;i<=b;i++)c.push(v(i));n-1===b+1?(i=n-1,c.push(v(i))):n-1>b&&(n-2*e.paginationPagesBySide>e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((n-g)/2+g),c.push(v(i," page-intermediate"))):c.push(hr.sprintf(this.constants.html.paginationItem," page-first-separator disabled","","...")))}for(i=n;i<=o;i++)c.push(v(i));if(this.totalPages>o){var m=this.totalPages-(e.paginationPagesBySide-1);for(o>=m&&(m=o+1),o+1===m-1?(i=o+1,c.push(v(i))):m>o+1&&(this.totalPages-o>2*e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((this.totalPages-g-o)/2+o),c.push(v(i," page-intermediate"))):c.push(hr.sprintf(this.constants.html.paginationItem," page-last-separator disabled","","..."))),i=m;i<=this.totalPages;i++)c.push(v(i))}c.push(hr.sprintf(this.constants.html.paginationItem," page-next",e.formatSRPaginationNextText(),e.paginationNextText)),c.push(this.constants.html.pagination[1],"</div>")}this.$pagination.html(c.join(""));var y=["bottom","both"].includes(e.paginationVAlign)?" ".concat(this.constants.classes.dropup):"";this.$pagination.last().find(".page-list > span").addClass(y),e.onlyInfoPagination||(r=this.$pagination.find(".page-list a"),a=this.$pagination.find(".page-pre"),s=this.$pagination.find(".page-next"),l=this.$pagination.find(".page-item").not(".page-next, .page-pre, .page-last-separator, .page-first-separator"),this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),e.smartDisplay&&(d.length<2||e.totalRows<=d[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"](),e.paginationLoop||(1===e.pageNumber&&a.addClass("disabled"),e.pageNumber===this.totalPages&&s.addClass("disabled")),h&&(e.pageSize=e.formatAllRows()),r.off("click").on("click",(function(e){return t.onPageListChange(e)})),a.off("click").on("click",(function(e){return t.onPagePre(e)})),s.off("click").on("click",(function(e){return t.onPageNext(e)})),l.off("click").on("click",(function(e){return t.onPageNumber(e)})))}else this.$pagination.hide()}},{key:"updatePagination",value:function(e){e&&t(e.currentTarget).hasClass("disabled")||(this.options.maintainMetaData||this.resetRows(),this.initPagination(),"server"===this.options.sidePagination?this.initServer():this.initBody(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize))}},{key:"onPageListChange",value:function(e){e.preventDefault();var i=t(e.currentTarget);return i.parent().addClass(this.constants.classes.dropdownActive).siblings().removeClass(this.constants.classes.dropdownActive),this.options.pageSize=i.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+i.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(e),!1}},{key:"onPagePre",value:function(t){return t.preventDefault(),this.options.pageNumber-1==0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(t),!1}},{key:"onPageNext",value:function(t){return t.preventDefault(),this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(t),!1}},{key:"onPageNumber",value:function(e){if(e.preventDefault(),this.options.pageNumber!==+t(e.currentTarget).text())return this.options.pageNumber=+t(e.currentTarget).text(),this.updatePagination(e),!1}},{key:"initRow",value:function(t,e,i,n){var o=this,r=[],a={},s=[],l="",c={},h=[];if(!(hr.findIndex(this.hiddenRows,t)>-1)){if((a=hr.calculateObjectValue(this.options,this.options.rowStyle,[t,e],a))&&a.css)for(var u=0,d=Object.entries(a.css);u<d.length;u++){var f=tr(d[u],2),p=f[0],g=f[1];s.push("".concat(p,": ").concat(g))}if(c=hr.calculateObjectValue(this.options,this.options.rowAttributes,[t,e],c))for(var v=0,b=Object.entries(c);v<b.length;v++){var m=tr(b[v],2),y=m[0],w=m[1];h.push("".concat(y,'="').concat(hr.escapeHTML(w),'"'))}if(t._data&&!hr.isEmptyObject(t._data))for(var S=0,x=Object.entries(t._data);S<x.length;S++){var k=tr(x[S],2),O=k[0],C=k[1];if("index"===O)return;l+=" data-".concat(O,"='").concat("object"===Yo(C)?JSON.stringify(C):C,"'")}return r.push("<tr",hr.sprintf(" %s",h.length?h.join(" "):void 0),hr.sprintf(' id="%s"',Array.isArray(t)?void 0:t._id),hr.sprintf(' class="%s"',a.classes||(Array.isArray(t)?void 0:t._class)),' data-index="'.concat(e,'"'),hr.sprintf(' data-uniqueid="%s"',hr.getItemField(t,this.options.uniqueId,!1)),hr.sprintf(' data-has-detail-view="%s"',!this.options.cardView&&this.options.detailView&&hr.calculateObjectValue(null,this.options.detailFilter,[e,t])?"true":void 0),hr.sprintf("%s",l),">"),this.options.cardView&&r.push('<td colspan="'.concat(this.header.fields.length,'"><div class="card-views">')),!this.options.cardView&&this.options.detailView&&this.options.detailViewIcon&&(r.push("<td>"),hr.calculateObjectValue(null,this.options.detailFilter,[e,t])&&r.push('\n          <a class="detail-icon" href="#">\n          '.concat(hr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen),"\n          </a>\n        ")),r.push("</td>")),this.header.fields.forEach((function(i,n){var a="",l=hr.getItemField(t,i,o.options.escape),c="",h="",u={},d="",f=o.header.classes[n],p="",g="",v="",b="",m="",y=o.columns[n];if((!o.fromHtml||void 0!==l||y.checkbox||y.radio)&&y.visible&&(!o.options.cardView||y.cardVisible)){if(y.escape&&(l=hr.escapeHTML(l)),s.concat([o.header.styles[n]]).length&&(p=' style="'.concat(s.concat([o.header.styles[n]]).join("; "),'"')),t["_".concat(i,"_id")]&&(d=hr.sprintf(' id="%s"',t["_".concat(i,"_id")])),t["_".concat(i,"_class")]&&(f=hr.sprintf(' class="%s"',t["_".concat(i,"_class")])),t["_".concat(i,"_rowspan")]&&(v=hr.sprintf(' rowspan="%s"',t["_".concat(i,"_rowspan")])),t["_".concat(i,"_colspan")]&&(b=hr.sprintf(' colspan="%s"',t["_".concat(i,"_colspan")])),t["_".concat(i,"_title")]&&(m=hr.sprintf(' title="%s"',t["_".concat(i,"_title")])),(u=hr.calculateObjectValue(o.header,o.header.cellStyles[n],[l,t,e,i],u)).classes&&(f=' class="'.concat(u.classes,'"')),u.css){for(var w=[],S=0,x=Object.entries(u.css);S<x.length;S++){var k=tr(x[S],2),O=k[0],C=k[1];w.push("".concat(O,": ").concat(C))}p=' style="'.concat(w.concat(o.header.styles[n]).join("; "),'"')}if(c=hr.calculateObjectValue(y,o.header.formatters[n],[l,t,e,i],l),t["_".concat(i,"_data")]&&!hr.isEmptyObject(t["_".concat(i,"_data")]))for(var T=0,P=Object.entries(t["_".concat(i,"_data")]);T<P.length;T++){var $=tr(P[T],2),I=$[0],A=$[1];if("index"===I)return;g+=" data-".concat(I,'="').concat(A,'"')}if(y.checkbox||y.radio){h=y.checkbox?"checkbox":h,h=y.radio?"radio":h;var E=y.class||"",R=(!0===c||l||c&&c.checked)&&!1!==c,j=!y.checkboxEnabled||c&&c.disabled;a=[o.options.cardView?'<div class="card-view '.concat(E,'">'):'<td class="bs-checkbox '.concat(E,'"').concat(f).concat(p,">"),'<label>\n            <input\n            data-index="'.concat(e,'"\n            name="').concat(o.options.selectItemName,'"\n            type="').concat(h,'"\n            ').concat(hr.sprintf('value="%s"',t[o.options.idField]),"\n            ").concat(hr.sprintf('checked="%s"',R?"checked":void 0),"\n            ").concat(hr.sprintf('disabled="%s"',j?"disabled":void 0)," />\n            <span></span>\n            </label>"),o.header.formatters[n]&&"string"==typeof c?c:"",o.options.cardView?"</div>":"</td>"].join(""),t[o.header.stateField]=!0===c||!!l||c&&c.checked}else if(c=null==c?o.options.undefinedText:c,o.options.cardView){var N=o.options.showHeader?'<span class="card-view-title"'.concat(p,">").concat(hr.getFieldTitle(o.columns,i),"</span>"):"";a='<div class="card-view">'.concat(N,'<span class="card-view-value">').concat(c,"</span></div>"),o.options.smartDisplay&&""===c&&(a='<div class="card-view"></div>')}else a="<td".concat(d).concat(f).concat(p).concat(g).concat(v).concat(b).concat(m,">").concat(c,"</td>");r.push(a)}})),this.options.cardView&&r.push("</div></td>"),r.push("</tr>"),r.join("")}}},{key:"initBody",value:function(e){var i=this,n=this.getData();this.trigger("pre-body",n),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=t("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=n.length);for(var o=[],r=t(document.createDocumentFragment()),a=!1,s=this.pageFrom-1;s<this.pageTo;s++){var l=n[s],c=this.initRow(l,s,n,r);a=a||!!c,c&&"string"==typeof c&&(this.options.virtualScroll?o.push(c):r.append(c))}a?this.options.virtualScroll?(this.virtualScroll&&this.virtualScroll.destroy(),this.virtualScroll=new ur({rows:o,fixedScroll:e,scrollEl:this.$tableBody[0],contentEl:this.$body[0],itemHeight:this.options.virtualScrollItemHeight,callback:function(){i.fitHeader(),i.initBodyEvent()}})):this.$body.html(r):this.$body.html('<tr class="no-records-found">'.concat(hr.sprintf('<td colspan="%s">%s</td>',this.$header.find("th").length,this.options.formatNoMatches()),"</tr>")),e||this.scrollTo(0),this.initBodyEvent(),this.updateSelected(),this.initFooter(),this.resetView(),"server"!==this.options.sidePagination&&(this.options.totalRows=n.length),this.trigger("post-body",n)}},{key:"initBodyEvent",value:function(){var e=this;this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",(function(i){var n=t(i.currentTarget),o=n.parent(),r=t(i.target).parents(".card-views").children(),a=t(i.target).parents(".card-view"),s=o.data("index"),l=e.data[s],c=e.options.cardView?r.index(a):n[0].cellIndex,h=e.getVisibleFields()[e.options.detailView&&e.options.detailViewIcon&&!e.options.cardView?c-1:c],u=e.columns[e.fieldsColumnsIndex[h]],d=hr.getItemField(l,h,e.options.escape);if(!n.find(".detail-icon").length){if(e.trigger("click"===i.type?"click-cell":"dbl-click-cell",h,d,l,n),e.trigger("click"===i.type?"click-row":"dbl-click-row",l,o,h),"click"===i.type&&e.options.clickToSelect&&u.clickToSelect&&!hr.calculateObjectValue(e.options,e.options.ignoreClickToSelectOn,[i.target])){var f=o.find(hr.sprintf('[name="%s"]',e.options.selectItemName));f.length&&f[0].click()}"click"===i.type&&e.options.detailViewByClick&&e.toggleDetailView(s,e.header.detailFormatters[e.fieldsColumnsIndex[h]])}})).off("mousedown").on("mousedown",(function(t){e.multipleSelectRowCtrlKey=t.ctrlKey||t.metaKey,e.multipleSelectRowShiftKey=t.shiftKey})),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",(function(i){return i.preventDefault(),e.toggleDetailView(t(i.currentTarget).parent().parent().data("index")),!1})),this.$selectItem=this.$body.find(hr.sprintf('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",(function(i){i.stopImmediatePropagation();var n=t(i.currentTarget);e._toggleCheck(n.prop("checked"),n.data("index"))})),this.header.events.forEach((function(i,n){var o=i;if(o){"string"==typeof o&&(o=hr.calculateObjectValue(null,o));var r=e.header.fields[n],a=e.getVisibleFields().indexOf(r);if(-1!==a){e.options.detailView&&!e.options.cardView&&(a+=1);var s=function(i){if(!o.hasOwnProperty(i))return"continue";var n=o[i];e.$body.find(">tr:not(.no-records-found)").each((function(o,s){var l=t(s),c=l.find(e.options.cardView?".card-views>.card-view":">td").eq(a),h=i.indexOf(" "),u=i.substring(0,h),d=i.substring(h+1);c.find(d).off(u).on(u,(function(t){var i=l.data("index"),o=e.data[i],a=o[r];n.apply(e,[t,a,o,i])}))}))};for(var l in o)s(l)}}}))}},{key:"initServer",value:function(e,i,n){var o=this,r={},a=this.header.fields.indexOf(this.options.sortName),s={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};if(this.header.sortNames[a]&&(s.sortName=this.header.sortNames[a]),this.options.pagination&&"server"===this.options.sidePagination&&(s.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,s.pageNumber=this.options.pageNumber),(n||this.options.url||this.options.ajax)&&("limit"===this.options.queryParamsType&&(s={search:s.searchText,sort:s.sortName,order:s.sortOrder},this.options.pagination&&"server"===this.options.sidePagination&&(s.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),s.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,0===s.limit&&delete s.limit)),hr.isEmptyObject(this.filterColumnsPartial)||(s.filter=JSON.stringify(this.filterColumnsPartial,null)),t.extend(s,i||{}),!1!==(r=hr.calculateObjectValue(this.options,this.options.queryParams,[s],r)))){e||this.showLoading();var l=t.extend({},hr.calculateObjectValue(null,this.options.ajaxOptions),{type:this.options.method,url:n||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(r):r,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(t,i,n){var r=hr.calculateObjectValue(o.options,o.options.responseHandler,[t,n],t);o.load(r),o.trigger("load-success",r,n&&n.status,n),e||o.hideLoading(),"server"===o.options.sidePagination&&r[o.options.totalField]>0&&!r[o.options.dataField].length&&o.updatePagination()},error:function(t){var i=[];"server"===o.options.sidePagination&&((i={})[o.options.totalField]=0,i[o.options.dataField]=[]),o.load(i),o.trigger("load-error",t&&t.status,t),e||o.$tableLoading.hide()}});return this.options.ajax?hr.calculateObjectValue(this,this.options.ajax,[l],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=t.ajax(l)),r}}},{key:"initSearchText",value:function(){if(this.options.search&&(this.searchText="",""!==this.options.searchText)){var t=this.$toolbar.find(".search input");t.val(this.options.searchText),this.onSearch({currentTarget:t,firedByInitSearchText:!0})}}},{key:"getCaret",value:function(){var e=this;this.$header.find("th").each((function(i,n){t(n).find(".sortable").removeClass("desc asc").addClass(t(n).data("field")===e.options.sortName?e.options.sortOrder:"both")}))}},{key:"updateSelected",value:function(){var e=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",e),this.$selectItem.each((function(e,i){t(i).closest("tr")[t(i).prop("checked")?"addClass":"removeClass"]("selected")}))}},{key:"updateRows",value:function(){var e=this;this.$selectItem.each((function(i,n){e.data[t(n).data("index")][e.header.stateField]=t(n).prop("checked")}))}},{key:"resetRows",value:function(){var t=!0,e=!1,i=void 0;try{for(var n,o=this.data[Symbol.iterator]();!(t=(n=o.next()).done);t=!0){var r=n.value;this.$selectAll.prop("checked",!1),this.$selectItem.prop("checked",!1),this.header.stateField&&(r[this.header.stateField]=!1)}}catch(t){e=!0,i=t}finally{try{t||null==o.return||o.return()}finally{if(e)throw i}}this.initHiddenRows()}},{key:"trigger",value:function(i){for(var n,o="".concat(i,".bs.table"),r=arguments.length,a=new Array(r>1?r-1:0),s=1;s<r;s++)a[s-1]=arguments[s];(n=this.options)[e.EVENTS[o]].apply(n,a),this.$el.trigger(t.Event(o),a),this.options.onAll(o,a),this.$el.trigger(t.Event("all.bs.table"),[o,a])}},{key:"resetHeader",value:function(){var t=this;clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout((function(){return t.fitHeader()}),this.$el.is(":hidden")?100:0)}},{key:"fitHeader",value:function(){var e=this;if(this.$el.is(":hidden"))this.timeoutId_=setTimeout((function(){return e.fitHeader()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?hr.getScrollBarWidth():0;this.$el.css("margin-top",-this.$header.outerHeight());var o=t(":focus");if(o.length>0){var r=o.parents("th");if(r.length>0){var a=r.attr("data-field");if(void 0!==a){var s=this.$header.find("[data-field='".concat(a,"']"));s.length>0&&s.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),this.$tableLoading.css("width",this.$el.outerWidth());var l=t(".focus-temp:visible:eq(0)");l.length>0&&(l.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each((function(i,n){e.$header_.find(hr.sprintf('th[data-field="%s"]',t(n).data("field"))).data(t(n).data())}));for(var c=this.getVisibleFields(),h=this.$header_.find("th"),u=this.$body.find(">tr:not(.no-records-found,.virtual-scroll-top)").eq(0);u.length&&u.find('>td[colspan]:not([colspan="1"])').length;)u=u.next();u.find("> *").each((function(i,n){var o=t(n),r=i;if(e.options.detailView&&e.options.detailViewIcon&&!e.options.cardView){if(0===i){var a=h.filter(".detail"),s=a.innerWidth()-a.find(".fht-cell").width();a.find(".fht-cell").width(o.innerWidth()-s)}r=i-1}if(-1!==r){var l=e.$header_.find(hr.sprintf('th[data-field="%s"]',c[r]));l.length>1&&(l=t(h[o[0].cellIndex]));var u=l.innerWidth()-l.find(".fht-cell").width();l.find(".fht-cell").width(o.innerWidth()-u)}})),this.horizontalScroll(),this.trigger("post-header")}}},{key:"initFooter",value:function(){if(this.options.showFooter&&!this.options.cardView){var t=this.getData(),e=[];!this.options.cardView&&this.options.detailView&&this.options.detailViewIcon&&e.push('<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>');var i=!0,n=!1,o=void 0;try{for(var r,a=this.columns[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s,l,c=r.value,h=[],u={},d=hr.sprintf(' class="%s"',c.class);if(c.visible){if(this.options.cardView&&!c.cardVisible)return;if(s=hr.sprintf("text-align: %s; ",c.falign?c.falign:c.align),l=hr.sprintf("vertical-align: %s; ",c.valign),(u=hr.calculateObjectValue(null,this.options.footerStyle,[c]))&&u.css)for(var f=0,p=Object.entries(u.css);f<p.length;f++){var g=tr(p[f],2),v=g[0],b=g[1];h.push("".concat(v,": ").concat(b))}u&&u.classes&&(d=hr.sprintf(' class="%s"',c.class?[c.class,u.classes].join(" "):u.classes)),e.push("<th",d,hr.sprintf(' style="%s"',s+l+h.concat().join("; ")),">"),e.push('<div class="th-inner">'),e.push(hr.calculateObjectValue(c,c.footerFormatter,[t],this.footerData[0]&&this.footerData[0][c.field]||"")),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</th>")}}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}this.options.height||this.$tableFooter.length||(this.$el.append("<tfoot><tr></tr></tfoot>"),this.$tableFooter=this.$el.find("tfoot")),this.$tableFooter.find("tr").html(e.join("")),this.trigger("post-footer",this.$tableFooter)}}},{key:"fitFooter",value:function(){var e=this;if(this.$el.is(":hidden"))setTimeout((function(){return e.fitFooter()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?hr.getScrollBarWidth():0;this.$tableFooter.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).attr("class",this.$el.attr("class"));this.getVisibleFields();for(var o=this.$tableFooter.find("th"),r=this.$body.find(">tr:first-child:not(.no-records-found)");r.length&&r.find('>td[colspan]:not([colspan="1"])').length;)r=r.next();r.find("> *").each((function(i,n){var r=t(n),a=i;if(e.options.detailView&&!e.options.cardView){if(0===i){var s=o.filter(".detail"),l=s.innerWidth()-s.find(".fht-cell").width();s.find(".fht-cell").width(r.innerWidth()-l)}a=i-1}if(-1!==a){var c=o.eq(i),h=c.innerWidth()-c.find(".fht-cell").width();c.find(".fht-cell").width(r.innerWidth()-h)}})),this.horizontalScroll()}}},{key:"horizontalScroll",value:function(){var t=this;this.$tableBody.off("scroll").on("scroll",(function(){var e=t.$tableBody.scrollLeft();t.options.showHeader&&t.options.height&&t.$tableHeader.scrollLeft(e),t.options.showFooter&&!t.options.cardView&&t.$tableFooter.scrollLeft(e),t.trigger("scroll-body",t.$tableBody)}))}},{key:"getVisibleFields",value:function(){var t=[],e=!0,i=!1,n=void 0;try{for(var o,r=this.header.fields[Symbol.iterator]();!(e=(o=r.next()).done);e=!0){var a=o.value,s=this.columns[this.fieldsColumnsIndex[a]];s&&s.visible&&t.push(a)}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return t}},{key:"initHiddenRows",value:function(){this.hiddenRows=[]}},{key:"getOptions",value:function(){var e=t.extend({},this.options);return delete e.data,t.extend(!0,{},e)}},{key:"refreshOptions",value:function(e){hr.compareObjects(this.options,e,!0)||(this.options=t.extend(this.options,e),this.trigger("refresh-options",this.options),this.destroy(),this.init())}},{key:"getData",value:function(t){var e=this.options.data;if(!(this.searchText||this.options.customSearch||this.options.sortName)&&hr.isEmptyObject(this.filterColumns)&&hr.isEmptyObject(this.filterColumnsPartial)||t&&t.unfiltered||(e=this.data),t&&t.useCurrentPage&&(e=e.slice(this.pageFrom-1,this.pageTo)),t&&!t.includeHiddenRows){var i=this.getHiddenRows();e=e.filter((function(t){return-1===hr.findIndex(i,t)}))}return e}},{key:"getSelections",value:function(){var t=this;return this.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"getAllSelections",value:function(){var t=this;return this.options.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"load",value:function(t){var e,i=t;this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalRows=i[this.options.totalField]),this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalNotFiltered=i[this.options.totalNotFilteredField]),e=i.fixedScroll,i=Array.isArray(i)?i:i[this.options.dataField],this.initData(i),this.initSearch(),this.initPagination(),this.initBody(e)}},{key:"append",value:function(t){this.initData(t,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"prepend",value:function(t){this.initData(t,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"remove",value:function(t){var e,i,n=this.options.data.length;if(t.hasOwnProperty("field")&&t.hasOwnProperty("values")){for(e=n-1;e>=0;e--)(i=this.options.data[e]).hasOwnProperty(t.field)&&t.values.includes(i[t.field])&&(this.options.data.splice(e,1),"server"===this.options.sidePagination&&(this.options.totalRows-=1));n!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}}},{key:"removeAll",value:function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"insertRow",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("row")&&(this.options.data.splice(t.index,0,t.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},{key:"updateRow",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;l.hasOwnProperty("index")&&l.hasOwnProperty("row")&&(t.extend(this.options.data[l.index],l.row),l.hasOwnProperty("replace")&&l.replace?this.options.data[l.index]=l.row:t.extend(this.options.data[l.index],l.row))}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"getRowByUniqueId",value:function(t){var e,i,n,o=this.options.uniqueId,r=t,a=null;for(e=this.options.data.length-1;e>=0;e--){if((i=this.options.data[e]).hasOwnProperty(o))n=i[o];else{if(!i._data||!i._data.hasOwnProperty(o))continue;n=i._data[o]}if("string"==typeof n?r=r.toString():"number"==typeof n&&(Number(n)===n&&n%1==0?r=parseInt(r):n===Number(n)&&0!==n&&(r=parseFloat(r))),n===r){a=i;break}}return a}},{key:"updateByUniqueId",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.hasOwnProperty("id")&&l.hasOwnProperty("row")){var c=this.options.data.indexOf(this.getRowByUniqueId(l.id));-1!==c&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[c]=l.row:t.extend(this.options.data[c],l.row))}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"removeByUniqueId",value:function(t){var e=this.options.data.length,i=this.getRowByUniqueId(t);i&&this.options.data.splice(this.options.data.indexOf(i),1),e!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"updateCell",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("field")&&t.hasOwnProperty("value")&&(this.data[t.index][t.field]=t.value,!1!==t.reinit&&(this.initSort(),this.initBody(!0)))}},{key:"updateCellByUniqueId",value:function(t){var e=this;t.hasOwnProperty("id")&&t.hasOwnProperty("field")&&t.hasOwnProperty("value")&&((Array.isArray(t)?t:[t]).forEach((function(t){var i=t.id,n=t.field,o=t.value,r=e.options.data.indexOf(e.getRowByUniqueId(i));-1!==r&&(e.options.data[r][n]=o)})),!1!==t.reinit&&(this.initSort(),this.initBody(!0)))}},{key:"showRow",value:function(t){this._toggleRow(t,!0)}},{key:"hideRow",value:function(t){this._toggleRow(t,!1)}},{key:"_toggleRow",value:function(t,e){var i;if(t.hasOwnProperty("index")?i=this.getData()[t.index]:t.hasOwnProperty("uniqueId")&&(i=this.getRowByUniqueId(t.uniqueId)),i){var n=hr.findIndex(this.hiddenRows,i);e||-1!==n?e&&n>-1&&this.hiddenRows.splice(n,1):this.hiddenRows.push(i),e?this.updatePagination():(this.initBody(!0),this.initPagination())}}},{key:"getHiddenRows",value:function(t){if(t)return this.initHiddenRows(),void this.initBody(!0);var e=this.getData(),i=[],n=!0,o=!1,r=void 0;try{for(var a,s=e[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;this.hiddenRows.includes(l)&&i.push(l)}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return this.hiddenRows=i,i}},{key:"showColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!0,!0)}))}},{key:"hideColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!1,!0)}))}},{key:"_toggleColumn",value:function(t,e,i){if(-1!==t&&this.columns[t].visible!==e&&(this.columns[t].visible=e,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var n=this.$toolbar.find('.keep-open input:not(".toggle-all")').prop("disabled",!1);i&&n.filter(hr.sprintf('[value="%s"]',t)).prop("checked",e),n.filter(":checked").length<=this.options.minimumCountColumns&&n.filter(":checked").prop("disabled",!0)}}},{key:"getVisibleColumns",value:function(){var t=this;return this.columns.filter((function(e){return e.visible&&!t.isSelectionColumn(e)}))}},{key:"getHiddenColumns",value:function(){return this.columns.filter((function(t){return!t.visible}))}},{key:"isSelectionColumn",value:function(t){return t.radio||t.checkbox}},{key:"showAllColumns",value:function(){this._toggleAllColumns(!0)}},{key:"hideAllColumns",value:function(){this._toggleAllColumns(!1)}},{key:"_toggleAllColumns",value:function(e){var i=this,n=!0,o=!1,r=void 0;try{for(var a,s=this.columns.slice().reverse()[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.switchable){if(!e&&this.options.showColumns&&this.getVisibleColumns().length===this.options.minimumCountColumns)continue;l.visible=e}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}if(this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var c=this.$toolbar.find('.keep-open input[type="checkbox"]:not(".toggle-all")').prop("disabled",!1);e?c.prop("checked",e):c.get().reverse().forEach((function(n){c.filter(":checked").length>i.options.minimumCountColumns&&t(n).prop("checked",e)})),c.filter(":checked").length<=this.options.minimumCountColumns&&c.filter(":checked").prop("disabled",!0)}}},{key:"mergeCells",value:function(t){var e,i,n=t.index,o=this.getVisibleFields().indexOf(t.field),r=t.rowspan||1,a=t.colspan||1,s=this.$body.find(">tr");this.options.detailView&&!this.options.cardView&&(o+=1);var l=s.eq(n).find(">td").eq(o);if(!(n<0||o<0||n>=this.data.length)){for(e=n;e<n+r;e++)for(i=o;i<o+a;i++)s.eq(e).find(">td").eq(i).hide();l.attr("rowspan",r).attr("colspan",a).show()}}},{key:"checkAll",value:function(){this._toggleCheckAll(!0)}},{key:"uncheckAll",value:function(){this._toggleCheckAll(!1)}},{key:"_toggleCheckAll",value:function(t){var e=this.getSelections();this.$selectAll.add(this.$selectAll_).prop("checked",t),this.$selectItem.filter(":enabled").prop("checked",t),this.updateRows();var i=this.getSelections();t?this.trigger("check-all",i,e):this.trigger("uncheck-all",i,e)}},{key:"checkInvert",value:function(){var e=this.$selectItem.filter(":enabled"),i=e.filter(":checked");e.each((function(e,i){t(i).prop("checked",!t(i).prop("checked"))})),this.updateRows(),this.updateSelected(),this.trigger("uncheck-some",i),i=this.getSelections(),this.trigger("check-some",i)}},{key:"check",value:function(t){this._toggleCheck(!0,t)}},{key:"uncheck",value:function(t){this._toggleCheck(!1,t)}},{key:"_toggleCheck",value:function(t,e){var i=this.$selectItem.filter('[data-index="'.concat(e,'"]')),n=this.data[e];if(i.is(":radio")||this.options.singleSelect||this.options.multipleSelectRow&&!this.multipleSelectRowCtrlKey&&!this.multipleSelectRowShiftKey){var o=!0,r=!1,a=void 0;try{for(var s,l=this.options.data[Symbol.iterator]();!(o=(s=l.next()).done);o=!0){s.value[this.header.stateField]=!1}}catch(t){r=!0,a=t}finally{try{o||null==l.return||l.return()}finally{if(r)throw a}}this.$selectItem.filter(":checked").not(i).prop("checked",!1)}if(n[this.header.stateField]=t,this.options.multipleSelectRow){if(this.multipleSelectRowShiftKey&&this.multipleSelectRowLastSelectedIndex>=0)for(var c=[this.multipleSelectRowLastSelectedIndex,e].sort(),h=c[0]+1;h<c[1];h++)this.data[h][this.header.stateField]=!0,this.$selectItem.filter('[data-index="'.concat(h,'"]')).prop("checked",!0);this.multipleSelectRowCtrlKey=!1,this.multipleSelectRowShiftKey=!1,this.multipleSelectRowLastSelectedIndex=t?e:-1}i.prop("checked",t),this.updateSelected(),this.trigger(t?"check":"uncheck",this.data[e],i)}},{key:"checkBy",value:function(t){this._toggleCheckBy(!0,t)}},{key:"uncheckBy",value:function(t){this._toggleCheckBy(!1,t)}},{key:"_toggleCheckBy",value:function(t,e){var i=this;if(e.hasOwnProperty("field")&&e.hasOwnProperty("values")){var n=[];this.data.forEach((function(o,r){if(!o.hasOwnProperty(e.field))return!1;if(e.values.includes(o[e.field])){var a=i.$selectItem.filter(":enabled").filter(hr.sprintf('[data-index="%s"]',r));if(!(a=t?a.not(":checked"):a.filter(":checked")).length)return;a.prop("checked",t),o[i.header.stateField]=t,n.push(o),i.trigger(t?"check":"uncheck",o,a)}})),this.updateSelected(),this.trigger(t?"check-some":"uncheck-some",n)}}},{key:"refresh",value:function(t){t&&t.url&&(this.options.url=t.url),t&&t.pageNumber&&(this.options.pageNumber=t.pageNumber),t&&t.pageSize&&(this.options.pageSize=t.pageSize),this.trigger("refresh",this.initServer(t&&t.silent,t&&t.query,t&&t.url))}},{key:"destroy",value:function(){this.$el.insertBefore(this.$container),t(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")}},{key:"resetView",value:function(t){var e=0;if(t&&t.height&&(this.options.height=t.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.$tableContainer.toggleClass("has-card-view",this.options.cardView),!this.options.cardView&&this.options.showHeader&&this.options.height?(this.$tableHeader.show(),this.resetHeader(),e+=this.$header.outerHeight(!0)+1):(this.$tableHeader.hide(),this.trigger("post-header")),!this.options.cardView&&this.options.showFooter&&(this.$tableFooter.show(),this.fitFooter(),this.options.height&&(e+=this.$tableFooter.outerHeight(!0))),this.$container.hasClass("fullscreen"))this.$tableContainer.css("height",""),this.$tableContainer.css("width","");else if(this.options.height){var i=this.$toolbar.outerHeight(!0),n=this.$pagination.outerHeight(!0),o=this.options.height-i-n,r=this.$tableBody.find(">table"),a=r.outerHeight();if(this.$tableContainer.css("height","".concat(o,"px")),this.$tableBorder){var s=o-a-2;this.$tableBody[0].scrollWidth-this.$tableBody.innerWidth()&&(s-=hr.getScrollBarWidth()),this.$tableBorder.css("width","".concat(r.outerWidth(),"px")),this.$tableBorder.css("height","".concat(s,"px"))}}this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),this.$tableFooter.hide()):(this.getCaret(),this.$tableContainer.css("padding-bottom","".concat(e,"px"))),this.trigger("reset-view")}},{key:"showLoading",value:function(){this.$tableLoading.css("display","flex")}},{key:"hideLoading",value:function(){this.$tableLoading.css("display","none")}},{key:"togglePagination",value:function(){this.options.pagination=!this.options.pagination;var t=this.options.showButtonIcons?this.options.pagination?this.options.icons.paginationSwitchDown:this.options.icons.paginationSwitchUp:"",e=this.options.showButtonText?this.options.pagination?this.options.formatPaginationSwitchUp():this.options.formatPaginationSwitchDown():"";this.$toolbar.find('button[name="paginationSwitch"]').html(hr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.updatePagination()}},{key:"toggleFullscreen",value:function(){this.$el.closest(".bootstrap-table").toggleClass("fullscreen"),this.resetView()}},{key:"toggleView",value:function(){this.options.cardView=!this.options.cardView,this.initHeader();var t=this.options.showButtonIcons?this.options.cardView?this.options.icons.toggleOn:this.options.icons.toggleOff:"",e=this.options.showButtonText?this.options.cardView?this.options.formatToggleOff():this.options.formatToggleOn():"";this.$toolbar.find('button[name="toggle"]').html(hr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.initBody(),this.trigger("toggle",this.options.cardView)}},{key:"resetSearch",value:function(t){var e=this.$toolbar.find(".search input");e.val(t||""),this.onSearch({currentTarget:e})}},{key:"filterBy",value:function(e,i){this.filterOptions=hr.isEmptyObject(i)?this.options.filterOptions:t.extend(this.options.filterOptions,i),this.filterColumns=hr.isEmptyObject(e)?{}:e,this.options.pageNumber=1,this.initSearch(),this.updatePagination()}},{key:"scrollTo",value:function(e){if(void 0===e)return this.$tableBody.scrollTop();var i={unit:"px",value:0};"object"===Yo(e)?i=Object.assign(i,e):"string"==typeof e&&"bottom"===e?i.value=this.$tableBody[0].scrollHeight:"string"==typeof e&&(i.value=e);var n=i.value;"rows"===i.unit&&(n=0,this.$body.find("> tr:lt(".concat(i.value,")")).each((function(e,i){n+=t(i).outerHeight(!0)}))),this.$tableBody.scrollTop(n)}},{key:"getScrollPosition",value:function(){return this.scrollTo()}},{key:"selectPage",value:function(t){t>0&&t<=this.options.totalPages&&(this.options.pageNumber=t,this.updatePagination())}},{key:"prevPage",value:function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())}},{key:"nextPage",value:function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())}},{key:"toggleDetailView",value:function(t,e){this.$body.find(hr.sprintf('> tr[data-index="%s"]',t)).next().is("tr.detail-view")?this.collapseRow(t):this.expandRow(t,e),this.resetView()}},{key:"expandRow",value:function(t,e){var i=this.data[t],n=this.$body.find(hr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));if(!n.next().is("tr.detail-view")){this.options.detailViewIcon&&n.find("a.detail-icon").html(hr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailClose)),n.after(hr.sprintf('<tr class="detail-view"><td colspan="%s"></td></tr>',n.children("td").length));var o=n.next().find("td"),r=e||this.options.detailFormatter,a=hr.calculateObjectValue(this.options,r,[t,i,o],"");1===o.length&&o.append(a),this.trigger("expand-row",t,i,o)}}},{key:"collapseRow",value:function(t){var e=this.data[t],i=this.$body.find(hr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));i.next().is("tr.detail-view")&&(this.options.detailViewIcon&&i.find("a.detail-icon").html(hr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen)),this.trigger("collapse-row",t,e,i.next()),i.next().remove())}},{key:"expandAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.expandRow(t(e[i]).data("index"))}},{key:"collapseAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.collapseRow(t(e[i]).data("index"))}},{key:"updateColumnTitle",value:function(e){e.hasOwnProperty("field")&&e.hasOwnProperty("title")&&(this.columns[this.fieldsColumnsIndex[e.field]].title=this.options.escape?hr.escapeHTML(e.title):e.title,this.columns[this.fieldsColumnsIndex[e.field]].visible&&(void 0!==this.options.height?this.$tableHeader:this.$header).find("th[data-field]").each((function(i,n){if(t(n).data("field")===e.field)return t(t(n).find(".th-inner")[0]).text(e.title),!1})))}},{key:"updateFormatText",value:function(t,e){/^format/.test(t)&&this.options[t]&&("string"==typeof e?this.options[t]=function(){return e}:"function"==typeof e&&(this.options[t]=e),this.initToolbar(),this.initPagination(),this.initBody())}}]),e}();return dr.VERSION=lr.VERSION,dr.DEFAULTS=lr.DEFAULTS,dr.LOCALES=lr.LOCALES,dr.COLUMN_DEFAULTS=lr.COLUMN_DEFAULTS,dr.METHODS=lr.METHODS,dr.EVENTS=lr.EVENTS,t.BootstrapTable=dr,t.fn.bootstrapTable=function(e){for(var i=arguments.length,n=new Array(i>1?i-1:0),o=1;o<i;o++)n[o-1]=arguments[o];var r;return this.each((function(i,o){var a=t(o).data("bootstrap.table"),s=t.extend({},dr.DEFAULTS,t(o).data(),"object"===Yo(e)&&e);if("string"==typeof e){var l;if(!lr.METHODS.includes(e))throw new Error("Unknown method: ".concat(e));if(!a)return;r=(l=a)[e].apply(l,n),"destroy"===e&&t(o).removeData("bootstrap.table")}a||t(o).data("bootstrap.table",a=new t.BootstrapTable(o,s))})),void 0===r?this:r},t.fn.bootstrapTable.Constructor=dr,t.fn.bootstrapTable.theme=lr.THEME,t.fn.bootstrapTable.VERSION=lr.VERSION,t.fn.bootstrapTable.defaults=dr.DEFAULTS,t.fn.bootstrapTable.columnDefaults=dr.COLUMN_DEFAULTS,t.fn.bootstrapTable.events=dr.EVENTS,t.fn.bootstrapTable.locales=dr.LOCALES,t.fn.bootstrapTable.methods=dr.METHODS,t.fn.bootstrapTable.utils=hr,t((function(){t('[data-toggle="table"]').bootstrapTable()})),dr}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
index 7d9bdad5..024542f7 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["af-ZA"]={formatLoadingMessage:function(){return"Besig om te laai, wag asseblief ..."},formatRecordsPerPage:function(a){return a+" rekords per bladsy"},formatShowingRows:function(a,b,c){return"Resultate "+a+" tot "+b+" van "+c+" rye"},formatSearch:function(){return"Soek"},formatNoMatches:function(){return"Geen rekords gevind nie"},formatPaginationSwitch:function(){return"Wys/verberg bladsy nummering"},formatRefresh:function(){return"Herlaai"},formatToggle:function(){return"Wissel"},formatColumns:function(){return"Kolomme"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["af-ZA"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,c={f:f&&!a.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return y(d(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=m(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!c.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},R=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var k,F,N,I,L=C.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),G=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),W=0,z=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++W+z).toString(36)},H=G("keys"),K={},Z=o.WeakMap;if(q){var J=new Z,Q=J.get,U=J.has,V=J.set;k=function(t,n){return V.call(J,t,n),n},F=function(t){return Q.call(J,t)||{}},N=function(t){return U.call(J,t)}}else{var Y=H[I="state"]||(H[I]=B(I));K[Y]=!0,k=function(t,n){return M(t,Y,n),n},F=function(t){return w(t,Y)?t[Y]:{}},N=function(t){return w(t,Y)}}var X,$,tt={set:k,get:F,has:N,enforce:function(t){return N(t)?F(t):k(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,c=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!c&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:R(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,ct=function(t){return t>0?ft(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ct(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=G("wks"),kt=o.Symbol,Ft=Ct?kt:B,Nt=function(t){return w(_t,t)||(Rt&&w(kt,t)?_t[t]=kt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},It=Nt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,Gt=qt&&qt.versions,Wt=Gt&&Gt.v8;Wt?$=(X=Wt.split("."))[0]+X[1]:Dt&&(!(X=Dt.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Dt.match(/Chrome\/(\d+)/))&&($=X[1]);var zt,Bt=$&&+$,Ht=Nt("species"),Kt=Nt("isConcatSpreadable"),Zt=Bt>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Jt=(zt="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[zt](Boolean).foo}))),Qt=function(t){if(!h(t))return!1;var n=t[Kt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,f=t.target,c=t.global,l=t.stat;if(r=c?o:l?o[f]||R(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Tt(c?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Zt||!Jt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=ct(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(a,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,f++,i)}return a.length=f,a}}),t.fn.bootstrapTable.locales["af-ZA"]={formatLoadingMessage:function(){return"Besig om te laai, wag asseblief"},formatRecordsPerPage:function(t){return"".concat(t," rekords per bladsy")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Resultate ".concat(t," tot ").concat(n," van ").concat(r," rye (filtered from ").concat(e," total rows)"):"Resultate ".concat(t," tot ").concat(n," van ").concat(r," rye")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Soek"},formatNoMatches:function(){return"Geen rekords gevind nie"},formatPaginationSwitch:function(){return"Wys/verberg bladsy nummering"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Herlaai"},formatToggle:function(){return"Wissel"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolomme"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["af-ZA"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
index 8d0295eb..f9109bfd 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ar-SA"]={formatLoadingMessage:function(){return"جاري التحميل, يرجى الإنتظار..."},formatRecordsPerPage:function(a){return a+" سجل لكل صفحة"},formatShowingRows:function(a,b,c){return"الظاهر "+a+" إلى "+b+" من "+c+" سجل"},formatSearch:function(){return"بحث"},formatNoMatches:function(){return"لا توجد نتائج مطابقة للبحث"},formatPaginationSwitch:function(){return"إخفاءإظهار ترقيم الصفحات"},formatRefresh:function(){return"تحديث"},formatToggle:function(){return"تغيير"},formatColumns:function(){return"أعمدة"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ar-SA"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var F,N,k,I,L=_.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,B=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+B).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(q){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;F=function(t,n){return Y.call(Q,t,n),n},N=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=H(I));J[X]=!0,F=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),Ft=o.Symbol,Nt=_t?Ft:H,kt=function(t){return w(Rt,t)||(Ct&&w(Ft,t)?Rt[t]=Ft[t]:Rt[t]=Nt("Symbol."+t)),Rt[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Ht=$&&+$,Wt=kt("species"),Jt=kt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Bt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["ar-SA"]={formatLoadingMessage:function(){return"جاري التحميل, يرجى الإنتظار"},formatRecordsPerPage:function(t){return"".concat(t," سجل لكل صفحة")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"الظاهر ".concat(t," إلى ").concat(n," من ").concat(r," سجل ").concat(e," total rows)"):"الظاهر ".concat(t," إلى ").concat(n," من ").concat(r," سجل")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"بحث"},formatNoMatches:function(){return"لا توجد نتائج مطابقة للبحث"},formatPaginationSwitch:function(){return"إخفاءإظهار ترقيم الصفحات"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"تحديث"},formatToggle:function(){return"تغيير"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"أعمدة"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ar-SA"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
index 48a514e1..920e9261 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ca-ES"]={formatLoadingMessage:function(){return"Espereu, si us plau..."},formatRecordsPerPage:function(a){return a+" resultats per pàgina"},formatShowingRows:function(a,b,c){return"Mostrant de "+a+" fins "+b+" - total "+c+" resultats"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"No s'han trobat resultats"},formatPaginationSwitch:function(){return"Amaga/Mostra paginació"},formatRefresh:function(){return"Refresca"},formatToggle:function(){return"Alterna formatació"},formatColumns:function(){return"Columnes"},formatAllRows:function(){return"Tots"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ca-ES"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return y(d(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=m(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:u?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,F,k,I,L=R.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,B=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+B).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(q){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=H(I));J[X]=!0,N=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:N,get:F,has:k,enforce:function(t){return k(t)?F(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,Ft=Rt?Nt:H,kt=function(t){return w(_t,t)||(Ct&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},It=kt("species"),Lt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Ht=$&&+$,Wt=kt("species"),Jt=kt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Bt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=At(this),a=Lt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["ca-ES"]={formatLoadingMessage:function(){return"Espereu, si us plau"},formatRecordsPerPage:function(t){return"".concat(t," resultats per pàgina")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Mostrant de ".concat(t," fins ").concat(n," - total ").concat(r," resultats (filtered from ").concat(e," total rows)"):"Mostrant de ".concat(t," fins ").concat(n," - total ").concat(r," resultats")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"No s'han trobat resultats"},formatPaginationSwitch:function(){return"Amaga/Mostra paginació"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresca"},formatToggle:function(){return"Alterna formatació"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnes"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Tots"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ca-ES"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
index 024ce416..d4e86f8f 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["cs-CZ"]={formatLoadingMessage:function(){return"Čekejte, prosím..."},formatRecordsPerPage:function(a){return a+" položek na stránku"},formatShowingRows:function(a,b,c){return"Zobrazena "+a+". - "+b+". položka z celkových "+c},formatSearch:function(){return"Vyhledávání"},formatNoMatches:function(){return"Nenalezena žádná vyhovující položka"},formatPaginationSwitch:function(){return"Skrýt/Zobrazit stránkování"},formatRefresh:function(){return"Aktualizovat"},formatToggle:function(){return"Přepni"},formatColumns:function(){return"Sloupce"},formatAllRows:function(){return"Vše"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["cs-CZ"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,a=Object.getOwnPropertyDescriptor,f={f:a&&!c.call({1:2},1)?function(t){var n=a(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},k=Object.defineProperty,A={f:u?k:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return k(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},E=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{E(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var z,R,N,F,I=C.inspectSource,L=o.WeakMap,D="function"==typeof L&&/native code/.test(I(L)),Z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),q=0,G=Math.random(),V=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++q+G).toString(36)},B=Z("keys"),H={},W=o.WeakMap;if(D){var J=new W,K=J.get,Q=J.has,U=J.set;z=function(t,n){return U.call(J,t,n),n},R=function(t){return K.call(J,t)||{}},N=function(t){return Q.call(J,t)}}else{var Y=B[F="state"]||(B[F]=V(F));H[Y]=!0,z=function(t,n){return E(t,Y,n),n},R=function(t){return w(t,Y)?t[Y]:{}},N=function(t){return w(t,Y)}}var X,$,tt={set:z,get:R,has:N,enforce:function(t){return N(t)?R(t):z(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,a=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||E(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!f&&t[n]&&(a=!0):delete t[n],a?t[n]=i:E(t,n,i)):a?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},at=Math.min,ft=function(t){return t>0?at(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ft(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(H,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=A.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,kt=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(d(t))},Et=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=Z("wks"),zt=o.Symbol,Rt=Ct?zt:V,Nt=function(t){return w(_t,t)||(Mt&&w(zt,t)?_t[t]=zt[t]:_t[t]=Rt("Symbol."+t)),_t[t]},Ft=Nt("species"),It=function(t,n){var r;return kt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!kt(r.prototype)?m(r)&&null===(r=r[Ft])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Lt=ot("navigator","userAgent")||"",Dt=o.process,Zt=Dt&&Dt.versions,qt=Zt&&Zt.v8;qt?$=(X=qt.split("."))[0]+X[1]:Lt&&(!(X=Lt.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Lt.match(/Chrome\/(\d+)/))&&($=X[1]);var Gt,Vt=$&&+$,Bt=Nt("species"),Ht=Nt("isConcatSpreadable"),Wt=Vt>=51||!i((function(){var t=[];return t[Ht]=!1,t.concat()[0]!==t})),Jt=(Gt="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Kt=function(t){if(!m(t))return!1;var n=t[Ht];return void 0!==n?!!n:kt(t)};!function(t,n){var r,e,i,u,c,a=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[a]||M(a,{}):(o[a]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(f?e:a+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&E(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,r,e,o,i,u=At(this),c=It(u,0),a=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Kt(i)){if(a+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,a++)r in i&&Et(c,a,i[r])}else{if(a>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Et(c,a++,i)}return c.length=a,c}}),t.fn.bootstrapTable.locales["cs-CZ"]={formatLoadingMessage:function(){return"Čekejte, prosím"},formatRecordsPerPage:function(t){return"".concat(t," položek na stránku")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Zobrazena ".concat(t,". - ").concat(n," . položka z celkových ").concat(r," (filtered from ").concat(e," total rows)"):"Zobrazena ".concat(t,". - ").concat(n," . položka z celkových ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Vyhledávání"},formatNoMatches:function(){return"Nenalezena žádná vyhovující položka"},formatPaginationSwitch:function(){return"Skrýt/Zobrazit stránkování"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Aktualizovat"},formatToggle:function(){return"Přepni"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Sloupce"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Vše"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["cs-CZ"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
index 9ae8adc0..749ad6e4 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["da-DK"]={formatLoadingMessage:function(){return"Indlæser, vent venligst..."},formatRecordsPerPage:function(a){return a+" poster pr side"},formatShowingRows:function(a,b,c){return"Viser "+a+" til "+b+" af "+c+" rækker"},formatSearch:function(){return"Søg"},formatNoMatches:function(){return"Ingen poster fundet"},formatRefresh:function(){return"Opdater"},formatToggle:function(){return"Skift"},formatColumns:function(){return"Kolonner"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["da-DK"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=m(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},k=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{k(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var C,I,D,F,N=R.inspectSource,L=o.WeakMap,q="function"==typeof L&&/native code/.test(N(L)),K=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),V=0,z=Math.random(),G=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++V+z).toString(36)},B=K("keys"),H={},W=o.WeakMap;if(q){var J=new W,Q=J.get,U=J.has,Y=J.set;C=function(t,n){return Y.call(J,t,n),n},I=function(t){return Q.call(J,t)||{}},D=function(t){return U.call(J,t)}}else{var X=B[F="state"]||(B[F]=G(F));H[X]=!0,C=function(t,n){return k(t,X,n),n},I=function(t){return w(t,X)?t[X]:{}},D=function(t){return w(t,X)}}var Z,$,tt={set:C,get:I,has:D,enforce:function(t){return D(t)?I(t):C(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=I(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||k(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:k(t,n,i)):f?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||N(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(H,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},kt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=K("wks"),Ct=o.Symbol,It=Rt?Ct:G,Dt=function(t){return w(_t,t)||(Mt&&w(Ct,t)?_t[t]=Ct[t]:_t[t]=It("Symbol."+t)),_t[t]},Ft=Dt("species"),Nt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?h(r)&&null===(r=r[Ft])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Lt=ot("navigator","userAgent")||"",qt=o.process,Kt=qt&&qt.versions,Vt=Kt&&Kt.v8;Vt?$=(Z=Vt.split("."))[0]+Z[1]:Lt&&(!(Z=Lt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Lt.match(/Chrome\/(\d+)/))&&($=Z[1]);var zt,Gt=$&&+$,Bt=Dt("species"),Ht=Dt("isConcatSpreadable"),Wt=Gt>=51||!i((function(){var t=[];return t[Ht]=!1,t.concat()[0]!==t})),Jt=(zt="concat",Gt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[zt](Boolean).foo}))),Qt=function(t){if(!h(t))return!1;var n=t[Ht];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||M(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&k(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Nt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&kt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");kt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["da-DK"]={formatLoadingMessage:function(){return"Indlæser, vent venligst"},formatRecordsPerPage:function(t){return"".concat(t," poster pr side")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Viser ".concat(t," til ").concat(n," af ").concat(r," række").concat(r>1?"r":""," (filtered from ").concat(e," total rows)"):"Viser ".concat(t," til ").concat(n," af ").concat(r," række").concat(r>1?"r":"")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Viser ".concat(t," række").concat(t>1?"r":"")},formatClearSearch:function(){return"Ryd filtre"},formatSearch:function(){return"Søg"},formatNoMatches:function(){return"Ingen poster fundet"},formatPaginationSwitch:function(){return"Skjul/vis nummerering"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Opdater"},formatToggle:function(){return"Skift"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolonner"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Eksporter"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["da-DK"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
index 6401da2a..151e83e8 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["de-DE"]={formatLoadingMessage:function(){return"Lade, bitte warten..."},formatRecordsPerPage:function(a){return a+" Zeilen pro Seite."},formatShowingRows:function(a,b,c){return"Zeige Zeile "+a+" bis "+b+" von "+c+" Zeilen"+(c>1?"n":"")+"."},formatDetailPagination:function(a){return"Zeige "+a+" Zeile"+(a>1?"n":"")+"."},formatSearch:function(){return"Suchen"},formatNoMatches:function(){return"Keine passenden Ergebnisse gefunden"},formatPaginationSwitch:function(){return"Verstecke/Zeige Nummerierung"},formatRefresh:function(){return"Neu laden"},formatToggle:function(){return"Umschalten"},formatColumns:function(){return"Spalten"},formatAllRows:function(){return"Alle"},formatExport:function(){return"Datenexport"},formatClearFilters:function(){return"Lösche Filter"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["de-DE"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,m=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return m(y(t))},d=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!d(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!d(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!d(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!d(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,S=function(t,n){return b.call(t,n)},w=o.document,O=d(w)&&d(w.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?w.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(S(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!d(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:u?E:function(t,n,e){if(x(t),n=v(n,!0),x(e),j)try{return E(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},M=u?function(t,n,e){return A.f(t,n,l(1,e))}:function(t,n,e){return t[n]=e,t},N=function(t,n){try{M(o,t,n)}catch(e){o[t]=n}return n},Z=o["__core-js_shared__"]||N("__core-js_shared__",{}),_=Function.toString;"function"!=typeof Z.inspectSource&&(Z.inspectSource=function(t){return _.call(t)});var C,R,k,D,L=Z.inspectSource,F=o.WeakMap,I="function"==typeof F&&/native code/.test(L(F)),V=e((function(t){(t.exports=function(t,n){return Z[t]||(Z[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),q=0,G=Math.random(),z=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++q+G).toString(36)},K=V("keys"),B={},U=o.WeakMap;if(I){var W=new U,J=W.get,Q=W.has,Y=W.set;C=function(t,n){return Y.call(W,t,n),n},R=function(t){return J.call(W,t)||{}},k=function(t){return Q.call(W,t)}}else{var H=K[D="state"]||(K[D]=z(D));B[H]=!0,C=function(t,n){return M(t,H,n),n},R=function(t){return S(t,H)?t[H]:{}},k=function(t){return S(t,H)}}var X,$,tt={set:C,get:R,has:k,enforce:function(t){return k(t)?R(t):C(t,{})},getterFor:function(t){return function(n){var e;if(!d(n)||(e=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},nt=e((function(t){var n=tt.get,e=tt.enforce,r=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||S(i,"name")||M(i,"name",n),e(i).source=r.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:N(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),et=o,rt=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?rt(et[t])||rt(o[t]):et[t]&&et[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,e,r){var o,i=h(n),u=at(i.length),c=function(t,n){var e=ct(t);return e<0?lt(e+n,0):st(e,n)}(r,u);if(t&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===e)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,mt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var e,r=h(t),o=0,i=[];for(e in r)!S(B,e)&&S(r,e)&&i.push(e);for(;n.length>o;)S(r,e=n[o++])&&(~gt(i,e)||i.push(e));return i}(t,mt)}},ht={f:Object.getOwnPropertySymbols},dt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),e=ht.f;return e?n.concat(e(t)):n},vt=function(t,n){for(var e=dt(n),r=A.f,o=T.f,i=0;i<e.length;i++){var u=e[i];S(t,u)||r(t,u,o(n,u))}},bt=/#|\.prototype\./,St=function(t,n){var e=Ot[wt(t)];return e==Pt||e!=jt&&("function"==typeof n?i(n):!!n)},wt=St.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=St.data={},jt=St.NATIVE="N",Pt=St.POLYFILL="P",Tt=St,xt=T.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(y(t))},Mt=function(t,n,e){var r=v(n);r in t?A.f(t,r,l(0,e)):t[r]=e},Nt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Zt=Nt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=V("wks"),Ct=o.Symbol,Rt=Zt?Ct:z,kt=function(t){return S(_t,t)||(Nt&&S(Ct,t)?_t[t]=Ct[t]:_t[t]=Rt("Symbol."+t)),_t[t]},Dt=kt("species"),Lt=function(t,n){var e;return Et(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!Et(e.prototype)?d(e)&&null===(e=e[Dt])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},Ft=ot("navigator","userAgent")||"",It=o.process,Vt=It&&It.versions,qt=Vt&&Vt.v8;qt?$=(X=qt.split("."))[0]+X[1]:Ft&&(!(X=Ft.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Ft.match(/Chrome\/(\d+)/))&&($=X[1]);var Gt,zt=$&&+$,Kt=kt("species"),Bt=kt("isConcatSpreadable"),Ut=zt>=51||!i((function(){var t=[];return t[Bt]=!1,t.concat()[0]!==t})),Wt=(Gt="concat",zt>=51||!i((function(){var t=[];return(t.constructor={})[Kt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Jt=function(t){if(!d(t))return!1;var n=t[Bt];return void 0!==n?!!n:Et(t)};!function(t,n){var e,r,i,u,c,f=t.target,a=t.global,l=t.stat;if(e=a?o:l?o[f]||N(f,{}):(o[f]||{}).prototype)for(r in n){if(u=n[r],i=t.noTargetGet?(c=xt(e,r))&&c.value:e[r],!Tt(a?r:f+(l?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(e,r,u,t)}}({target:"Array",proto:!0,forced:!Ut||!Wt},{concat:function(t){var n,e,r,o,i,u=At(this),c=Lt(u,0),f=0;for(n=-1,r=arguments.length;n<r;n++)if(i=-1===n?u:arguments[n],Jt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(e=0;e<o;e++,f++)e in i&&Mt(c,f,i[e])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["de-DE"]={formatLoadingMessage:function(){return"Lade, bitte warten"},formatRecordsPerPage:function(t){return"".concat(t," Zeilen pro Seite.")},formatShowingRows:function(t,n,e,r){return void 0!==r&&r>0&&r>e?"Zeige Zeile ".concat(t," bis ").concat(n," von ").concat(e," Zeile").concat(e>1?"n":""," (Gefiltert von ").concat(r," Zeile").concat(r>1?"n":"",")"):"Zeige Zeile ".concat(t," bis ").concat(n," von ").concat(e," Zeile").concat(e>1?"n":"",".")},formatSRPaginationPreText:function(){return"Vorherige Seite"},formatSRPaginationPageText:function(t){return"Zu Seite ".concat(t)},formatSRPaginationNextText:function(){return"Nächste Seite"},formatDetailPagination:function(t){return"Zeige ".concat(t," Zeile").concat(t>1?"n":"",".")},formatClearSearch:function(){return"Lösche Filter"},formatSearch:function(){return"Suchen"},formatNoMatches:function(){return"Keine passenden Ergebnisse gefunden"},formatPaginationSwitch:function(){return"Verstecke/Zeige Nummerierung"},formatPaginationSwitchDown:function(){return"Zeige Nummerierung"},formatPaginationSwitchUp:function(){return"Verstecke Nummerierung"},formatRefresh:function(){return"Neu laden"},formatToggle:function(){return"Umschalten"},formatToggleOn:function(){return"Normale Ansicht"},formatToggleOff:function(){return"Kartenansicht"},formatColumns:function(){return"Spalten"},formatColumnsToggleAll:function(){return"Alle umschalten"},formatFullscreen:function(){return"Vollbild"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisches Neuladen"},formatExport:function(){return"Datenexport"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Erweiterte Suche"},formatAdvancedCloseButton:function(){return"Schließen"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["de-DE"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
index 46c7f534..a531b3a8 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["el-GR"]={formatLoadingMessage:function(){return"Φορτώνει, παρακαλώ περιμένετε..."},formatRecordsPerPage:function(a){return a+" αποτελέσματα ανά σελίδα"},formatShowingRows:function(a,b,c){return"Εμφανίζονται από την "+a+" ως την "+b+" από σύνολο "+c+" σειρών"},formatSearch:function(){return"Αναζητήστε"},formatNoMatches:function(){return"Δεν βρέθηκαν αποτελέσματα"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["el-GR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=h(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},R=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var F,N,k,I,L=C.inspectSource,D=o.WeakMap,G="function"==typeof D&&/native code/.test(L(D)),q=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,H=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+H).toString(36)},W=q("keys"),J={},K=o.WeakMap;if(G){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;F=function(t,n){return Y.call(Q,t,n),n},N=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=B(I));J[X]=!0,F=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:R(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=q("wks"),Ft=o.Symbol,Nt=Ct?Ft:B,kt=function(t){return w(_t,t)||(Rt&&w(Ft,t)?_t[t]=Ft[t]:_t[t]=Nt("Symbol."+t)),_t[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",Gt=o.process,qt=Gt&&Gt.versions,zt=qt&&qt.v8;zt?$=(Z=zt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Bt=$&&+$,Wt=kt("species"),Jt=kt("isConcatSpreadable"),Kt=Bt>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Ht="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||R(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Pt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["el-GR"]={formatLoadingMessage:function(){return"Φορτώνει, παρακαλώ περιμένετε"},formatRecordsPerPage:function(t){return"".concat(t," αποτελέσματα ανά σελίδα")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Εμφανίζονται από την ".concat(t," ως την ").concat(n," από σύνολο ").concat(r," σειρών (filtered from ").concat(e," total rows)"):"Εμφανίζονται από την ".concat(t," ως την ").concat(n," από σύνολο ").concat(r," σειρών")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Αναζητήστε"},formatNoMatches:function(){return"Δεν βρέθηκαν αποτελέσματα"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["el-GR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
index a39dddd0..c76aee54 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["en-US"]={formatLoadingMessage:function(){return"Loading, please wait..."},formatRecordsPerPage:function(a){return a+" rows per page"},formatShowingRows:function(a,b,c){return"Showing "+a+" to "+b+" of "+c+" rows"},formatSearch:function(){return"Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatColumns:function(){return"Columns"},formatAllRows:function(){return"All"},formatExport:function(){return"Export data"},formatClearFilters:function(){return"Clear filters"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["en-US"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return d(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=h(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,F,L,k,I=R.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(I(D)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),W={},J=o.WeakMap;if(q){var K=new J,Q=K.get,V=K.has,Y=K.set;N=function(t,n){return Y.call(K,t,n),n},F=function(t){return Q.call(K,t)||{}},L=function(t){return V.call(K,t)}}else{var X=B[k="state"]||(B[k]=U(k));W[X]=!0,N=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},L=function(t){return w(t,X)}}var Z,$,tt={set:N,get:F,has:L,enforce:function(t){return L(t)?F(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,Ft=Rt?Nt:U,Lt=function(t){return w(_t,t)||(Ct&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},kt=Lt("species"),It=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Ut=$&&+$,Bt=Lt("species"),Wt=Lt("isConcatSpreadable"),Jt=Ut>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Kt=(Ht="concat",Ut>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Pt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=It(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["en-US"]={formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Showing ".concat(t," to ").concat(n," of ").concat(r," rows (filtered from ").concat(e," total rows)"):"Showing ".concat(t," to ").concat(n," of ").concat(r," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["en-US"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
index f65909a1..7376382b 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["es-AR"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-AR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),a=function(t){try{return!!t()}catch(t){return!0}},i=!a((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),u={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!u.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:u},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},d="".split,g=a((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return g(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),P=!i&&!a((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,T={f:i?j:function(t,n){if(t=m(t),n=v(n,!0),P)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},M=Object.defineProperty,A={f:i?M:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return M(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},E=i?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{E(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,I,L,k,q=R.inspectSource,F=o.WeakMap,D="function"==typeof F&&/native code/.test(q(F)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},J=z("keys"),K={},Q=o.WeakMap;if(D){var U=new Q,V=U.get,Y=U.has,H=U.set;N=function(t,n){return H.call(U,t,n),n},I=function(t){return V.call(U,t)||{}},L=function(t){return Y.call(U,t)}}else{var X=J[k="state"]||(J[k]=W(k));K[X]=!0,N=function(t,n){return E(t,X,n),n},I=function(t){return w(t,X)?t[X]:{}},L=function(t){return w(t,X)}}var Z,$,tt={set:N,get:I,has:L,enforce:function(t){return L(t)?I(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=I(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,a,i){var u=!!i&&!!i.unsafe,c=!!i&&!!i.enumerable,f=!!i&&!!i.noTargetGet;"function"==typeof a&&("string"!=typeof n||w(a,"name")||E(a,"name",n),r(a).source=e.join("string"==typeof n?n:"")),t!==o?(u?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=a:E(t,n,a)):c?t[n]=a:C(n,a)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||q(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},at=Math.ceil,it=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?it:at)(t)},ct=Math.min,ft=function(t){return t>0?ct(ut(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,a=m(n),i=ft(a.length),u=function(t,n){var r=ut(t);return r<0?lt(r+n,0):st(r,n)}(e,i);if(t&&r!=r){for(;i>u;)if((o=a[u++])!=o)return!0}else for(;i>u;u++)if((t||u in a)&&a[u]===r)return t||u||0;return!t&&-1}},dt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,a=[];for(r in e)!w(K,r)&&w(e,r)&&a.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~dt(a,r)||a.push(r));return a}(t,gt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=T.f,a=0;a<r.length;a++){var i=r[a];w(t,i)||e(t,i,o(n,i))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Pt&&("function"==typeof n?a(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",jt=wt.POLYFILL="P",Tt=wt,xt=T.f,Mt=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(y(t))},Et=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!a((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,It=Rt?Nt:W,Lt=function(t){return w(_t,t)||(Ct&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=It("Symbol."+t)),_t[t]},kt=Lt("species"),qt=function(t,n){var r;return Mt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Mt(r.prototype)?h(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Ft=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:Ft&&(!(Z=Ft.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Ft.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Wt=$&&+$,Jt=Lt("species"),Kt=Lt("isConcatSpreadable"),Qt=Wt>=51||!a((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Ut=(Gt="concat",Wt>=51||!a((function(){var t=[];return(t.constructor={})[Jt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Vt=function(t){if(!h(t))return!1;var n=t[Kt];return void 0!==n?!!n:Mt(t)};!function(t,n){var r,e,a,i,u,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(i=n[e],a=t.noTargetGet?(u=xt(r,e))&&u.value:r[e],!Tt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==a){if(typeof i==typeof a)continue;vt(i,a)}(t.sham||a&&a.sham)&&E(i,"sham",!0),nt(r,e,i,t)}}({target:"Array",proto:!0,forced:!Qt||!Ut},{concat:function(t){var n,r,e,o,a,i=At(this),u=qt(i,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(a=-1===n?i:arguments[n],Vt(a)){if(c+(o=ft(a.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in a&&Et(u,c,a[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Et(u,c++,a)}return u.length=c,u}}),t.fn.bootstrapTable.locales["es-AR"]={formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Mostrando desde ".concat(t," a ").concat(n," de ").concat(r," filas (filtrado de ").concat(e," columnas totales)"):"Mostrando desde ".concat(t," a ").concat(n," de ").concat(r," filas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"a la página ".concat(t)},formatSRPaginationNextText:function(){return"siguiente página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," columnas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Recargar"},formatToggle:function(){return"Cambiar"},formatToggleOn:function(){return"Mostrar vista de carta"},formatToggleOff:function(){return"Ocultar vista de carta"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Cambiar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Recargar"},formatExport:function(){return"Exportar datos"},formatJumpTo:function(){return"Ir"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-AR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
index 7eb6cff8..45dab4d8 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["es-CL"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" filas por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Cambiar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-CL"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=m(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},M=Object.defineProperty,A={f:u?M:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return M(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},E=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{E(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var L,N,F,k,I=R.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(I(q)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;L=function(t,n){return Y.call(Q,t,n),n},N=function(t){return U.call(Q,t)||{}},F=function(t){return V.call(Q,t)}}else{var X=W[k="state"]||(W[k]=H(k));J[X]=!0,L=function(t,n){return E(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:L,get:N,has:F,enforce:function(t){return F(t)?N(t):L(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||E(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:E(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,Mt=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(y(t))},Et=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Lt=o.Symbol,Nt=Rt?Lt:H,Ft=function(t){return w(_t,t)||(Ct&&w(Lt,t)?_t[t]=Lt[t]:_t[t]=Nt("Symbol."+t)),_t[t]},kt=Ft("species"),It=function(t,n){var r;return Mt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Mt(r.prototype)?h(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=Ft("species"),Jt=Ft("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:Mt(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&E(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=At(this),a=It(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Et(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Et(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["es-CL"]={formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," filas por página")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas (filtered from ").concat(e," total rows)"):"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Cambiar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-CL"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
index 6aab5769..79950730 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["es-CR"]={formatLoadingMessage:function(){return"Cargando, por favor espere..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando de "+a+" a "+b+" registros de "+c+" registros en total"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Alternar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-CR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=m(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,F,L,k,I=R.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(I(q)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},L=function(t){return V.call(Q,t)}}else{var X=W[k="state"]||(W[k]=H(k));J[X]=!0,N=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},L=function(t){return w(t,X)}}var Z,$,tt={set:N,get:F,has:L,enforce:function(t){return L(t)?F(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,Ft=Rt?Nt:H,Lt=function(t){return w(_t,t)||(Ct&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},kt=Lt("species"),It=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?h(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=Lt("species"),Jt=Lt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=It(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["es-CR"]={formatLoadingMessage:function(){return"Cargando, por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(r," registros en total (filtered from ").concat(e," total rows)"):"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(r," registros en total")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-CR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
index d91ae715..f59cb618 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["es-ES"]={formatLoadingMessage:function(){return"Por favor espere..."},formatRecordsPerPage:function(a){return a+" resultados por página"},formatShowingRows:function(a,b,c){return"Mostrando desde "+a+" hasta "+b+" - En total "+c+" resultados"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron resultados"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Ocultar/Mostrar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todos"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-ES"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},d="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return g(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=m(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,M={f:u?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},A=u?function(t,n,r){return M.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{A(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,F,L,k,q=R.inspectSource,I=o.WeakMap,D="function"==typeof I&&/native code/.test(q(I)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},L=function(t){return V.call(Q,t)}}else{var X=W[k="state"]||(W[k]=H(k));J[X]=!0,N=function(t,n){return A(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},L=function(t){return w(t,X)}}var Z,$,tt={set:N,get:F,has:L,enforce:function(t){return L(t)?F(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||A(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:A(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||q(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},dt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~dt(i,r)||i.push(r));return i}(t,gt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=M.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,Et=Array.isArray||function(t){return"Array"==p(t)},Mt=function(t){return Object(y(t))},At=function(t,n,r){var e=v(n);e in t?M.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,Ft=Rt?Nt:H,Lt=function(t){return w(_t,t)||(Ct&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},kt=Lt("species"),qt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?h(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},It=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:It&&(!(Z=It.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=It.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=Lt("species"),Jt=Lt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!jt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&A(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Mt(this),a=qt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&At(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");At(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["es-ES"]={formatLoadingMessage:function(){return"Por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," resultados por página")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Mostrando desde ".concat(t," hasta ").concat(n," - En total ").concat(r," resultados (filtered from ").concat(e," total rows)"):"Mostrando desde ".concat(t," hasta ").concat(n," - En total ").concat(r," resultados")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron resultados"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Ocultar/Mostrar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todos"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Exportar los datos"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-ES"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
index bbea4be7..d988979e 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["es-MX"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatDetailPagination:function(a){return"Mostrando "+a+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros que coincidan"},formatPaginationSwitch:function(){return"Mostrar/ocultar paginación"},formatRefresh:function(){return"Actualizar"},formatToggle:function(){return"Cambiar vista"},formatFullscreen:function(){return"Pantalla completa"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-MX"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},d="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return g(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=m(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},M=Object.defineProperty,A={f:u?M:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return M(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},E=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{E(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var N,L,k,q,F=_.inspectSource,I=o.WeakMap,D="function"==typeof I&&/native code/.test(F(I)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=z("keys"),X={},J=o.WeakMap;if(D){var K=new J,Q=K.get,U=K.has,V=K.set;N=function(t,n){return V.call(K,t,n),n},L=function(t){return Q.call(K,t)||{}},k=function(t){return U.call(K,t)}}else{var Y=W[q="state"]||(W[q]=H(q));X[Y]=!0,N=function(t,n){return E(t,Y,n),n},L=function(t){return w(t,Y)?t[Y]:{}},k=function(t){return w(t,Y)}}var Z,$,tt={set:N,get:L,has:k,enforce:function(t){return k(t)?L(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=L(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||E(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:E(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||F(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},dt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(X,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~dt(i,r)||i.push(r));return i}(t,gt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,Mt=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(y(t))},Et=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),Nt=o.Symbol,Lt=_t?Nt:H,kt=function(t){return w(Rt,t)||(Ct&&w(Nt,t)?Rt[t]=Nt[t]:Rt[t]=Lt("Symbol."+t)),Rt[t]},qt=kt("species"),Ft=function(t,n){var r;return Mt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Mt(r.prototype)?h(r)&&null===(r=r[qt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},It=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:It&&(!(Z=It.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=It.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=kt("species"),Xt=kt("isConcatSpreadable"),Jt=Ht>=51||!i((function(){var t=[];return t[Xt]=!1,t.concat()[0]!==t})),Kt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Qt=function(t){if(!h(t))return!1;var n=t[Xt];return void 0!==n?!!n:Mt(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!jt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&E(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=At(this),a=Ft(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Et(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Et(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["es-MX"]={formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas (filtered from ").concat(e," total rows)"):"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Mostrando ".concat(t," filas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros que coincidan"},formatPaginationSwitch:function(){return"Mostrar/ocultar paginación"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Actualizar"},formatToggle:function(){return"Cambiar vista"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-MX"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
index a4832d6d..d88eeed8 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["es-NI"]={formatLoadingMessage:function(){return"Cargando, por favor espere..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando de "+a+" a "+b+" registros de "+c+" registros en total"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Alternar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-NI"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=m(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,I,F,L,k=R.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(k(q)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},I=function(t){return U.call(Q,t)||{}},F=function(t){return V.call(Q,t)}}else{var X=W[L="state"]||(W[L]=H(L));J[X]=!0,N=function(t,n){return M(t,X,n),n},I=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:N,get:I,has:F,enforce:function(t){return F(t)?I(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=I(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||k(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,It=Rt?Nt:H,Ft=function(t){return w(_t,t)||(Ct&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=It("Symbol."+t)),_t[t]},Lt=Ft("species"),kt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?h(r)&&null===(r=r[Lt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=Ft("species"),Jt=Ft("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=kt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["es-NI"]={formatLoadingMessage:function(){return"Cargando, por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(r," registros en total (filtered from ").concat(e," total rows)"):"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(r," registros en total")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-NI"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
index 514507b5..c1165de4 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["es-SP"]={formatLoadingMessage:function(){return"Cargando, por favor espera..."},formatRecordsPerPage:function(a){return a+" registros por p&#225;gina."},formatShowingRows:function(a,b,c){return a+" - "+b+" de "+c+" registros."},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se han encontrado registros."},formatRefresh:function(){return"Actualizar"},formatToggle:function(){return"Alternar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-SP"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return d(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=h(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var N,F,L,k,I=_.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(I(q)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},L=function(t){return V.call(Q,t)}}else{var X=W[k="state"]||(W[k]=H(k));J[X]=!0,N=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},L=function(t){return w(t,X)}}var Z,$,tt={set:N,get:F,has:L,enforce:function(t){return L(t)?F(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),Nt=o.Symbol,Ft=_t?Nt:H,Lt=function(t){return w(Rt,t)||(Ct&&w(Nt,t)?Rt[t]=Nt[t]:Rt[t]=Ft("Symbol."+t)),Rt[t]},kt=Lt("species"),It=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=Lt("species"),Jt=Lt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!jt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=It(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["es-SP"]={formatLoadingMessage:function(){return"Cargando, por favor espera"},formatRecordsPerPage:function(t){return"".concat(t," registros por p&#225;gina.")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"".concat(t," - ").concat(n," de ").concat(r," registros (filtered from ").concat(e," total rows)"):"".concat(t," - ").concat(n," de ").concat(r," registros.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se han encontrado registros."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Actualizar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-SP"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
index 20ebe253..6ccc8dbe 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["et-EE"]={formatLoadingMessage:function(){return"Päring käib, palun oota..."},formatRecordsPerPage:function(a){return a+" rida lehe kohta"},formatShowingRows:function(a,b,c){return"Näitan tulemusi "+a+" kuni "+b+" - kokku "+c+" tulemust"},formatSearch:function(){return"Otsi"},formatNoMatches:function(){return"Päringu tingimustele ei vastanud ühtegi tulemust"},formatPaginationSwitch:function(){return"Näita/Peida lehtedeks jagamine"},formatRefresh:function(){return"Värskenda"},formatToggle:function(){return"Lülita"},formatColumns:function(){return"Veerud"},formatAllRows:function(){return"Kõik"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["et-EE"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,T={f:u?j:function(t,n){if(t=m(t),n=v(n,!0),P)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,k={f:u?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},A=u?function(t,n,r){return k.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{A(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var N,R,F,L,I=C.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(I(D)),z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,V=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+V).toString(36)},H=z("keys"),K={},W=o.WeakMap;if(q){var J=new W,Q=J.get,U=J.has,Y=J.set;N=function(t,n){return Y.call(J,t,n),n},R=function(t){return Q.call(J,t)||{}},F=function(t){return U.call(J,t)}}else{var X=H[L="state"]||(H[L]=B(L));K[X]=!0,N=function(t,n){return A(t,X,n),n},R=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:N,get:R,has:F,enforce:function(t){return F(t)?R(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||A(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:A(t,n,i)):c?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=k.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",jt=wt.POLYFILL="P",Tt=wt,xt=T.f,Et=Array.isArray||function(t){return"Array"==p(t)},kt=function(t){return Object(y(t))},At=function(t,n,r){var e=v(n);e in t?k.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,Rt=Ct?Nt:B,Ft=function(t){return w(_t,t)||(Mt&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=Rt("Symbol."+t)),_t[t]},Lt=Ft("species"),It=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?h(r)&&null===(r=r[Lt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Vt,Bt=$&&+$,Ht=Ft("species"),Kt=Ft("isConcatSpreadable"),Wt=Bt>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Jt=(Vt="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Vt](Boolean).foo}))),Qt=function(t){if(!h(t))return!1;var n=t[Kt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||M(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Tt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&A(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,r,e,o,i,u=kt(this),a=It(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&At(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");At(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["et-EE"]={formatLoadingMessage:function(){return"Päring käib, palun oota"},formatRecordsPerPage:function(t){return"".concat(t," rida lehe kohta")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Näitan tulemusi ".concat(t," kuni ").concat(n," - kokku ").concat(r," tulemust (filtered from ").concat(e," total rows)"):"Näitan tulemusi ".concat(t," kuni ").concat(n," - kokku ").concat(r," tulemust")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Otsi"},formatNoMatches:function(){return"Päringu tingimustele ei vastanud ühtegi tulemust"},formatPaginationSwitch:function(){return"Näita/Peida lehtedeks jagamine"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Värskenda"},formatToggle:function(){return"Lülita"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Veerud"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Kõik"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["et-EE"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
index bc4a4798..91dc1fe1 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["eu-EU"]={formatLoadingMessage:function(){return"Itxaron mesedez..."},formatRecordsPerPage:function(a){return a+" emaitza orriko."},formatShowingRows:function(a,b,c){return c+" erregistroetatik "+a+"etik "+b+"erakoak erakusten."},formatSearch:function(){return"Bilatu"},formatNoMatches:function(){return"Ez da emaitzarik aurkitu"},formatPaginationSwitch:function(){return"Ezkutatu/Erakutsi orrikatzea"},formatRefresh:function(){return"Eguneratu"},formatToggle:function(){return"Ezkutatu/Erakutsi"},formatColumns:function(){return"Zutabeak"},formatAllRows:function(){return"Guztiak"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["eu-EU"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return y(d(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),k=Object.getOwnPropertyDescriptor,P={f:u?k:function(t,n){if(t=m(t),n=v(n,!0),j)try{return k(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},T=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},x=Object.defineProperty,E={f:u?x:function(t,n,r){if(T(t),n=v(n,!0),T(r),j)try{return x(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},A=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{A(o,t,n)}catch(r){o[t]=n}return n},z=o["__core-js_shared__"]||M("__core-js_shared__",{}),C=Function.toString;"function"!=typeof z.inspectSource&&(z.inspectSource=function(t){return C.call(t)});var _,R,F,I,N=z.inspectSource,L=o.WeakMap,D="function"==typeof L&&/native code/.test(N(L)),q=r((function(t){(t.exports=function(t,n){return z[t]||(z[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,B=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+B).toString(36)},H=q("keys"),W={},J=o.WeakMap;if(D){var K=new J,Q=K.get,V=K.has,Y=K.set;_=function(t,n){return Y.call(K,t,n),n},R=function(t){return Q.call(K,t)||{}},F=function(t){return V.call(K,t)}}else{var Z=H[I="state"]||(H[I]=U(I));W[Z]=!0,_=function(t,n){return A(t,Z,n),n},R=function(t){return w(t,Z)?t[Z]:{}},F=function(t){return w(t,Z)}}var X,$,tt={set:_,get:R,has:F,enforce:function(t){return F(t)?R(t):_(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||A(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:A(t,n,i)):c?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||N(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=dt.f(T(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==kt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",kt=wt.POLYFILL="P",Pt=wt,Tt=P.f,xt=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},At=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),zt=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=q("wks"),_t=o.Symbol,Rt=zt?_t:U,Ft=function(t){return w(Ct,t)||(Mt&&w(_t,t)?Ct[t]=_t[t]:Ct[t]=Rt("Symbol."+t)),Ct[t]},It=Ft("species"),Nt=function(t,n){var r;return xt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!xt(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Lt=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Gt=qt&&qt.v8;Gt?$=(X=Gt.split("."))[0]+X[1]:Lt&&(!(X=Lt.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Lt.match(/Chrome\/(\d+)/))&&($=X[1]);var Bt,Ut=$&&+$,Ht=Ft("species"),Wt=Ft("isConcatSpreadable"),Jt=Ut>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Kt=(Bt="concat",Ut>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Qt=function(t){if(!h(t))return!1;var n=t[Wt];return void 0!==n?!!n:xt(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||M(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=Tt(r,e))&&a.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&A(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=Nt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&At(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");At(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["eu-EU"]={formatLoadingMessage:function(){return"Itxaron mesedez"},formatRecordsPerPage:function(t){return"".concat(t," emaitza orriko.")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"".concat(r," erregistroetatik ").concat(t,"etik ").concat(n,"erakoak erakusten (filtered from ").concat(e," total rows)"):"".concat(r," erregistroetatik ").concat(t,"etik ").concat(n,"erakoak erakusten.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Bilatu"},formatNoMatches:function(){return"Ez da emaitzarik aurkitu"},formatPaginationSwitch:function(){return"Ezkutatu/Erakutsi orrikatzea"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Eguneratu"},formatToggle:function(){return"Ezkutatu/Erakutsi"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Zutabeak"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Guztiak"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["eu-EU"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
index ba09033d..d238e965 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["fa-IR"]={formatLoadingMessage:function(){return"در حال بارگذاری, لطفا صبر کنید..."},formatRecordsPerPage:function(a){return a+" رکورد در صفحه"},formatShowingRows:function(a,b,c){return"نمایش "+a+" تا "+b+" از "+c+" ردیف"},formatSearch:function(){return"جستجو"},formatNoMatches:function(){return"رکوردی یافت نشد."},formatPaginationSwitch:function(){return"نمایش/مخفی صفحه بندی"},formatRefresh:function(){return"به روز رسانی"},formatToggle:function(){return"تغییر نمایش"},formatColumns:function(){return"سطر ها"},formatAllRows:function(){return"همه"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fa-IR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},R=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var I,F,N,k,L=C.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,B=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+B).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(q){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;I=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},N=function(t){return V.call(Q,t)}}else{var X=W[k="state"]||(W[k]=H(k));J[X]=!0,I=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},N=function(t){return w(t,X)}}var Z,$,tt={set:I,get:F,has:N,enforce:function(t){return N(t)?F(t):I(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:R(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),It=o.Symbol,Ft=Ct?It:H,Nt=function(t){return w(_t,t)||(Rt&&w(It,t)?_t[t]=It[t]:_t[t]=Ft("Symbol."+t)),_t[t]},kt=Nt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Ht=$&&+$,Wt=Nt("species"),Jt=Nt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Bt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||R(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["fa-IR"]={formatLoadingMessage:function(){return"در حال بارگذاری, لطفا صبر کنید"},formatRecordsPerPage:function(t){return"".concat(t," رکورد در صفحه")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"نمایش ".concat(t," تا ").concat(n," از ").concat(r," ردیف (filtered from ").concat(e," total rows)"):"نمایش ".concat(t," تا ").concat(n," از ").concat(r," ردیف")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"جستجو"},formatNoMatches:function(){return"رکوردی یافت نشد."},formatPaginationSwitch:function(){return"نمایش/مخفی صفحه بندی"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"به روز رسانی"},formatToggle:function(){return"تغییر نمایش"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"سطر ها"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"همه"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fa-IR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
new file mode 100644
index 00000000..7b7c95ae
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,c={f:f&&!a.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return g(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,T={f:u?j:function(t,n){if(t=h(t),n=v(n,!0),P)try{return j(t,n)}catch(t){}if(w(t,n))return l(!c.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},k=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||k("__core-js_shared__",{}),C=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return C.call(t)});var N,R,F,I,L=_.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),H=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,G=Math.random(),V=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+G).toString(36)},B=H("keys"),K={},W=o.WeakMap;if(q){var J=new W,Q=J.get,U=J.has,Y=J.set;N=function(t,n){return Y.call(J,t,n),n},R=function(t){return Q.call(J,t)||{}},F=function(t){return U.call(J,t)}}else{var X=B[I="state"]||(B[I]=V(I));K[X]=!0,N=function(t,n){return M(t,X,n),n},R=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:N,get:R,has:F,enforce:function(t){return F(t)?R(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,c=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!c&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,ct=function(t){return t>0?ft(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ct(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},yt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~yt(i,r)||i.push(r));return i}(t,gt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",jt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},kt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=kt&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=H("wks"),Nt=o.Symbol,Rt=_t?Nt:V,Ft=function(t){return w(Ct,t)||(kt&&w(Nt,t)?Ct[t]=Nt[t]:Ct[t]=Rt("Symbol."+t)),Ct[t]},It=Ft("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,Ht=qt&&qt.versions,zt=Ht&&Ht.v8;zt?$=(Z=zt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Vt=$&&+$,Bt=Ft("species"),Kt=Ft("isConcatSpreadable"),Wt=Vt>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Jt=(Gt="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Kt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,f=t.target,c=t.global,l=t.stat;if(r=c?o:l?o[f]||k(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Tt(c?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=ct(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(a,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,f++,i)}return a.length=f,a}}),t.fn.bootstrapTable.locales["fi-FI"]={formatLoadingMessage:function(){return"Ladataan, ole hyvä ja odota"},formatRecordsPerPage:function(t){return"".concat(t," riviä sivulla")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Näytetään rivit ".concat(t," - ").concat(n," / ").concat(r," (filtered from ").concat(e," total rows)"):"Näytetään rivit ".concat(t," - ").concat(n," / ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Poista suodattimet"},formatSearch:function(){return"Hae"},formatNoMatches:function(){return"Hakuehtoja vastaavia tuloksia ei löytynyt"},formatPaginationSwitch:function(){return"Näytä/Piilota sivutus"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Päivitä"},formatToggle:function(){return"Valitse"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Sarakkeet"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Kaikki"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Vie tiedot"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fi-FI"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
index 92ac742b..54b9451a 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["fr-BE"]={formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-BE"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return h(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=d(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},C=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{C(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var F,N,k,I,L=R.inspectSource,q=o.WeakMap,B="function"==typeof q&&/native code/.test(L(q)),D=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,G=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+G).toString(36)},J=D("keys"),K={},Q=o.WeakMap;if(B){var U=new Q,V=U.get,Y=U.has,H=U.set;F=function(t,n){return H.call(U,t,n),n},N=function(t){return V.call(U,t)||{}},k=function(t){return Y.call(U,t)}}else{var X=J[I="state"]||(J[I]=W(I));K[X]=!0,F=function(t,n){return C(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||C(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:C(t,n,i)):f?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=d(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,ht=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,ht)}},dt={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Ct=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=D("wks"),Ft=o.Symbol,Nt=Rt?Ft:W,kt=function(t){return w(_t,t)||(Mt&&w(Ft,t)?_t[t]=Ft[t]:_t[t]=Nt("Symbol."+t)),_t[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Bt=o.process,Dt=Bt&&Bt.versions,zt=Dt&&Dt.v8;zt?$=(Z=zt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Wt=$&&+$,Jt=kt("species"),Kt=kt("isConcatSpreadable"),Qt=Wt>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Ut=(Gt="concat",Wt>=51||!i((function(){var t=[];return(t.constructor={})[Jt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Vt=function(t){if(!m(t))return!1;var n=t[Kt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||M(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!jt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&C(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Qt||!Ut},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Vt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Ct(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Ct(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["fr-BE"]={formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrés à partir de ").concat(e," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de lignes trouvés"},formatPaginationSwitch:function(){return"Cacher/Afficher pagination"},formatPaginationSwitchDown:function(){return"Afficher pagination"},formatPaginationSwitchUp:function(){return"Cacher pagination"},formatRefresh:function(){return"Rafraichir"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher vue carte"},formatToggleOff:function(){return"Cacher vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Rafraîchissement automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-BE"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
new file mode 100644
index 00000000..c0dc4ca1
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return h(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=d(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},C=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{C(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var F,N,k,I,L=R.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(L(q)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;F=function(t,n){return Y.call(Q,t,n),n},N=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=H(I));J[X]=!0,F=function(t,n){return C(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||C(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:C(t,n,i)):f?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=d(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,ht=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,ht)}},dt={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Ct=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Ft=o.Symbol,Nt=Rt?Ft:H,kt=function(t){return w(_t,t)||(Mt&&w(Ft,t)?_t[t]=Ft[t]:_t[t]=Nt("Symbol."+t)),_t[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=kt("species"),Jt=kt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||M(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!jt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&C(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Ct(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Ct(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["fr-CH"]={formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrés à partir de ").concat(e," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de lignes trouvés"},formatPaginationSwitch:function(){return"Cacher/Afficher pagination"},formatPaginationSwitchDown:function(){return"Afficher pagination"},formatPaginationSwitchUp:function(){return"Cacher pagination"},formatRefresh:function(){return"Rafraichir"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher vue carte"},formatToggleOff:function(){return"Cacher vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Rafraîchissement automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-CH"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
index c87c9517..b59aeae8 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["fr-FR"]={formatLoadingMessage:function(){return"Chargement en cours, patientez, s´il vous plaît ..."},formatRecordsPerPage:function(a){return a+" lignes par page"},formatShowingRows:function(a,b,c){return"Affichage des lignes "+a+" à "+b+" sur "+c+" lignes au total"},formatSearch:function(){return"Rechercher"},formatNoMatches:function(){return"Aucun résultat trouvé"},formatPaginationSwitch:function(){return"Montrer/Masquer pagination"},formatRefresh:function(){return"Rafraîchir"},formatToggle:function(){return"Alterner"},formatColumns:function(){return"Colonnes"},formatAllRows:function(){return"Tous"},formatExport:function(){return"Exporter les données"},formatClearFilters:function(){return"Vider les filtres"},formatMultipleSort:function(){return"Tri avancé"},formatAddLevel:function(){return"Ajouter un niveau"},formatDeleteLevel:function(){return"Supprimer un niveau"},formatColumn:function(){return"Colonne"},formatOrder:function(){return"Ordre"},formatSortBy:function(){return"Trier par"},formatThenBy:function(){return"Puis par"},formatSort:function(){return"Trier"},formatCancel:function(){return"Annuler"},formatDuplicateAlertTitle:function(){return"Doublon(s) détecté(s)!"},formatDuplicateAlertDescription:function(){return"Supprimez ou changez les colonnes dupliquées."},formatSortOrders:function(){return{asc:"Croissant",desc:"Décroissant"}},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-FR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return h(y(t))},d=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!d(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!d(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!d(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!d(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=d(S)&&d(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=m(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!d(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},R=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{R(o,t,n)}catch(r){o[t]=n}return n},M=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof M.inspectSource&&(M.inspectSource=function(t){return _.call(t)});var F,N,k,I,L=M.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(L(q)),z=r((function(t){(t.exports=function(t,n){return M[t]||(M[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},J=z("keys"),K={},Q=o.WeakMap;if(D){var U=new Q,V=U.get,Y=U.has,H=U.set;F=function(t,n){return H.call(U,t,n),n},N=function(t){return V.call(U,t)||{}},k=function(t){return Y.call(U,t)}}else{var X=J[I="state"]||(J[I]=W(I));K[X]=!0,F=function(t,n){return R(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!d(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||R(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:R(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,ht=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,ht)}},mt={f:Object.getOwnPropertySymbols},dt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=dt(n),e=E.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Rt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Mt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Ft=o.Symbol,Nt=Mt?Ft:W,kt=function(t){return w(_t,t)||(Ct&&w(Ft,t)?_t[t]=Ft[t]:_t[t]=Nt("Symbol."+t)),_t[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?d(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Wt=$&&+$,Jt=kt("species"),Kt=kt("isConcatSpreadable"),Qt=Wt>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Ut=(Gt="concat",Wt>=51||!i((function(){var t=[];return(t.constructor={})[Jt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Vt=function(t){if(!d(t))return!1;var n=t[Kt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!jt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&R(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Qt||!Ut},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Vt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Rt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Rt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["fr-FR"]={formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrés à partir de ").concat(e," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Aucun résultat"},formatPaginationSwitch:function(){return"Cacher/Afficher pagination"},formatPaginationSwitchDown:function(){return"Afficher pagination"},formatPaginationSwitchUp:function(){return"Cacher pagination"},formatRefresh:function(){return"Rafraichir"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher vue carte"},formatToggleOff:function(){return"Cacher vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Rafraîchissement automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-FR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
new file mode 100644
index 00000000..6e33cab0
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return h(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=d(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},C=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{C(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var L,F,N,k,I=R.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(I(q)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,U=Math.random(),G=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+U).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,V=Q.get,Y=Q.has,H=Q.set;L=function(t,n){return H.call(Q,t,n),n},F=function(t){return V.call(Q,t)||{}},N=function(t){return Y.call(Q,t)}}else{var X=W[k="state"]||(W[k]=G(k));J[X]=!0,L=function(t,n){return C(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},N=function(t){return w(t,X)}}var Z,$,tt={set:L,get:F,has:N,enforce:function(t){return N(t)?F(t):L(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||C(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:C(t,n,i)):f?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=d(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,ht=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,ht)}},dt={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Ct=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Lt=o.Symbol,Ft=Rt?Lt:G,Nt=function(t){return w(_t,t)||(Mt&&w(Lt,t)?_t[t]=Lt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},kt=Nt("species"),It=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[kt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ut,Gt=$&&+$,Wt=Nt("species"),Jt=Nt("isConcatSpreadable"),Kt=Gt>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Ut="concat",Gt>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Ut](Boolean).foo}))),Vt=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||M(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!jt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&C(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=It(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Vt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Ct(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Ct(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["fr-LU"]={formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrés à partir de ").concat(e," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de lignes trouvés"},formatPaginationSwitch:function(){return"Cacher/Afficher pagination"},formatPaginationSwitchDown:function(){return"Afficher pagination"},formatPaginationSwitchUp:function(){return"Cacher pagination"},formatRefresh:function(){return"Rafraichir"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher vue carte"},formatToggleOff:function(){return"Cacher vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Rafraîchissement automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-LU"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
index ce8de424..c8d1d759 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["he-IL"]={formatLoadingMessage:function(){return"טוען, נא להמתין..."},formatRecordsPerPage:function(a){return a+" שורות בעמוד"},formatShowingRows:function(a,b,c){return"מציג "+a+" עד "+b+" מ-"+c+" שורות"},formatSearch:function(){return"חיפוש"},formatNoMatches:function(){return"לא נמצאו רשומות תואמות"},formatPaginationSwitch:function(){return"הסתר/הצג מספור דפים"},formatRefresh:function(){return"רענן"},formatToggle:function(){return"החלף תצוגה"},formatColumns:function(){return"עמודות"},formatAllRows:function(){return"הכל"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["he-IL"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var I,L,F,N,k=_.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(k(D)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,B=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+B).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(q){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;I=function(t,n){return Y.call(Q,t,n),n},L=function(t){return U.call(Q,t)||{}},F=function(t){return V.call(Q,t)}}else{var X=W[N="state"]||(W[N]=H(N));J[X]=!0,I=function(t,n){return M(t,X,n),n},L=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:I,get:L,has:F,enforce:function(t){return F(t)?L(t):I(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=L(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||k(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),It=o.Symbol,Lt=_t?It:H,Ft=function(t){return w(Rt,t)||(Ct&&w(It,t)?Rt[t]=It[t]:Rt[t]=Lt("Symbol."+t)),Rt[t]},Nt=Ft("species"),kt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[Nt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Ht=$&&+$,Wt=Ft("species"),Jt=Ft("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Bt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=kt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["he-IL"]={formatLoadingMessage:function(){return"טוען, נא להמתין"},formatRecordsPerPage:function(t){return"".concat(t," שורות בעמוד")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"מציג ".concat(t," עד ").concat(n," מ-").concat(r,"שורות").concat(e," total rows)"):"מציג ".concat(t," עד ").concat(n," מ-").concat(r," שורות")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"חיפוש"},formatNoMatches:function(){return"לא נמצאו רשומות תואמות"},formatPaginationSwitch:function(){return"הסתר/הצג מספור דפים"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"רענן"},formatToggle:function(){return"החלף תצוגה"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"עמודות"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"הכל"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["he-IL"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
index 6ca01e69..9f22db82 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["hr-HR"]={formatLoadingMessage:function(){return"Molimo pričekajte ..."},formatRecordsPerPage:function(a){return a+" broj zapisa po stranici"},formatShowingRows:function(a,b,c){return"Prikazujem "+a+". - "+b+". od ukupnog broja zapisa "+c},formatSearch:function(){return"Pretraži"},formatNoMatches:function(){return"Nije pronađen niti jedan zapis"},formatPaginationSwitch:function(){return"Prikaži/sakrij stranice"},formatRefresh:function(){return"Osvježi"},formatToggle:function(){return"Promijeni prikaz"},formatColumns:function(){return"Kolone"},formatAllRows:function(){return"Sve"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["hr-HR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,j=h(S)&&h(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",j?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),O=Object.getOwnPropertyDescriptor,T={f:u?O:function(t,n){if(t=m(t),n=v(n,!0),P)try{return O(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},k=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||k("__core-js_shared__",{}),C=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return C.call(t)});var _,z,N,F,I=R.inspectSource,L=o.WeakMap,D="function"==typeof L&&/native code/.test(I(L)),q=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),H=0,G=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++H+G).toString(36)},K=q("keys"),W={},J=o.WeakMap;if(D){var Q=new J,U=Q.get,V=Q.has,Y=Q.set;_=function(t,n){return Y.call(Q,t,n),n},z=function(t){return U.call(Q,t)||{}},N=function(t){return V.call(Q,t)}}else{var X=K[F="state"]||(K[F]=B(F));W[X]=!0,_=function(t,n){return M(t,X,n),n},z=function(t){return w(t,X)?t[X]:{}},N=function(t){return w(t,X)}}var Z,$,tt={set:_,get:z,has:N,enforce:function(t){return N(t)?z(t):_(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=z(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=jt[St(t)];return r==Ot||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},jt=wt.data={},Pt=wt.NATIVE="N",Ot=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},kt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=kt&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=q("wks"),_t=o.Symbol,zt=Rt?_t:B,Nt=function(t){return w(Ct,t)||(kt&&w(_t,t)?Ct[t]=_t[t]:Ct[t]=zt("Symbol."+t)),Ct[t]},Ft=Nt("species"),It=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?h(r)&&null===(r=r[Ft])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Lt=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Ht=qt&&qt.v8;Ht?$=(Z=Ht.split("."))[0]+Z[1]:Lt&&(!(Z=Lt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Lt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Bt=$&&+$,Kt=Nt("species"),Wt=Nt("isConcatSpreadable"),Jt=Bt>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Kt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||k(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Tt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=It(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["hr-HR"]={formatLoadingMessage:function(){return"Molimo pričekajte"},formatRecordsPerPage:function(t){return"".concat(t," broj zapisa po stranici")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Prikazujem ".concat(t,". - ").concat(n,". od ukupnog broja zapisa ").concat(r," (filtered from ").concat(e," total rows)"):"Prikazujem ".concat(t,". - ").concat(n,". od ukupnog broja zapisa ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Pretraži"},formatNoMatches:function(){return"Nije pronađen niti jedan zapis"},formatPaginationSwitch:function(){return"Prikaži/sakrij stranice"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Osvježi"},formatToggle:function(){return"Promijeni prikaz"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolone"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Sve"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["hr-HR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
index 8ae75c59..7cfd635b 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["hu-HU"]={formatLoadingMessage:function(){return"Betöltés, kérem várjon..."},formatRecordsPerPage:function(a){return a+" rekord per oldal"},formatShowingRows:function(a,b,c){return"Megjelenítve "+a+" - "+b+" / "+c+" összesen"},formatSearch:function(){return"Keresés"},formatNoMatches:function(){return"Nincs találat"},formatPaginationSwitch:function(){return"Lapozó elrejtése/megjelenítése"},formatRefresh:function(){return"Frissítés"},formatToggle:function(){return"Összecsuk/Kinyit"},formatColumns:function(){return"Oszlopok"},formatAllRows:function(){return"Összes"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["hu-HU"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!m(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!m(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!m(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,j=m(S)&&m(S.createElement),O=!u&&!i((function(){return 7!=Object.defineProperty((t="div",j?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),O)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,e){if(x(t),n=v(n,!0),x(e),O)try{return A(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},M=u?function(t,n,e){return E.f(t,n,l(1,e))}:function(t,n,e){return t[n]=e,t},C=function(t,n){try{M(o,t,n)}catch(e){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),k=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return k.call(t)});var R,z,F,N,L=_.inspectSource,I=o.WeakMap,D="function"==typeof I&&/native code/.test(L(I)),q=e((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),H=0,B=Math.random(),G=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++H+B).toString(36)},K=q("keys"),U={},W=o.WeakMap;if(D){var J=new W,Q=J.get,V=J.has,Y=J.set;R=function(t,n){return Y.call(J,t,n),n},z=function(t){return Q.call(J,t)||{}},F=function(t){return V.call(J,t)}}else{var X=K[N="state"]||(K[N]=G(N));U[X]=!0,R=function(t,n){return M(t,X,n),n},z=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:R,get:z,has:F,enforce:function(t){return F(t)?z(t):R(t,{})},getterFor:function(t){return function(n){var e;if(!m(n)||(e=z(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},nt=e((function(t){var n=tt.get,e=tt.enforce,r=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),e(i).source=r.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),et=o,rt=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?rt(et[t])||rt(o[t]):et[t]&&et[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,e,r){var o,i=h(n),u=at(i.length),c=function(t,n){var e=ct(t);return e<0?lt(e+n,0):st(e,n)}(r,u);if(t&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===e)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var e,r=h(t),o=0,i=[];for(e in r)!w(U,e)&&w(r,e)&&i.push(e);for(;n.length>o;)w(r,e=n[o++])&&(~gt(i,e)||i.push(e));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),e=ht.f;return e?n.concat(e(t)):n},vt=function(t,n){for(var e=mt(n),r=E.f,o=T.f,i=0;i<e.length;i++){var u=e[i];w(t,u)||r(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var e=jt[St(t)];return e==Pt||e!=Ot&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},jt=wt.data={},Ot=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,e){var r=v(n);r in t?E.f(t,r,l(0,e)):t[r]=e},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),kt=q("wks"),Rt=o.Symbol,zt=_t?Rt:G,Ft=function(t){return w(kt,t)||(Ct&&w(Rt,t)?kt[t]=Rt[t]:kt[t]=zt("Symbol."+t)),kt[t]},Nt=Ft("species"),Lt=function(t,n){var e;return At(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!At(e.prototype)?m(e)&&null===(e=e[Nt])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},It=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Ht=qt&&qt.v8;Ht?$=(Z=Ht.split("."))[0]+Z[1]:It&&(!(Z=It.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=It.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Gt=$&&+$,Kt=Ft("species"),Ut=Ft("isConcatSpreadable"),Wt=Gt>=51||!i((function(){var t=[];return t[Ut]=!1,t.concat()[0]!==t})),Jt=(Bt="concat",Gt>=51||!i((function(){var t=[];return(t.constructor={})[Kt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Ut];return void 0!==n?!!n:At(t)};!function(t,n){var e,r,i,u,c,f=t.target,a=t.global,l=t.stat;if(e=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(r in n){if(u=n[r],i=t.noTargetGet?(c=xt(e,r))&&c.value:e[r],!Tt(a?r:f+(l?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(e,r,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,e,r,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,r=arguments.length;n<r;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(e=0;e<o;e++,f++)e in i&&Mt(c,f,i[e])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["hu-HU"]={formatLoadingMessage:function(){return"Betöltés, kérem várjon"},formatRecordsPerPage:function(t){return"".concat(t," rekord per oldal")},formatShowingRows:function(t,n,e,r){return void 0!==r&&r>0&&r>e?"Megjelenítve ".concat(t," - ").concat(n," / ").concat(e," összesen (filtered from ").concat(r," total rows)"):"Megjelenítve ".concat(t," - ").concat(n," / ").concat(e," összesen")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Keresés"},formatNoMatches:function(){return"Nincs találat"},formatPaginationSwitch:function(){return"Lapozó elrejtése/megjelenítése"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Frissítés"},formatToggle:function(){return"Összecsuk/Kinyit"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Oszlopok"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Összes"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["hu-HU"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
index d6cb8b8c..9712efbb 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["id-ID"]={formatLoadingMessage:function(){return"Memuat, mohon tunggu..."},formatRecordsPerPage:function(a){return a+" baris per halaman"},formatShowingRows:function(a,b,c){return"Menampilkan "+a+" sampai "+b+" dari "+c+" baris"},formatSearch:function(){return"Pencarian"},formatNoMatches:function(){return"Tidak ditemukan data yang cocok"},formatPaginationSwitch:function(){return"Sembunyikan/Tampilkan halaman"},formatRefresh:function(){return"Muat ulang"},formatToggle:function(){return"Beralih"},formatColumns:function(){return"kolom"},formatAllRows:function(){return"Semua"},formatExport:function(){return"Ekspor data"},formatClearFilters:function(){return"Bersihkan filter"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["id-ID"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,m=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return m(d(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,j={f:u?P:function(t,n){if(t=y(t),n=v(n,!0),T)try{return P(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},M=Object.defineProperty,k={f:u?M:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return M(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},A=u?function(t,n,r){return k.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},E=function(t,n){try{A(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||E("__core-js_shared__",{}),C=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return C.call(t)});var R,I,D,F,N=_.inspectSource,L=o.WeakMap,q="function"==typeof L&&/native code/.test(N(L)),B=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+G).toString(36)},W=B("keys"),J={},K=o.WeakMap;if(q){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;R=function(t,n){return Y.call(Q,t,n),n},I=function(t){return U.call(Q,t)||{}},D=function(t){return V.call(Q,t)}}else{var X=W[F="state"]||(W[F]=H(F));J[X]=!0,R=function(t,n){return A(t,X,n),n},I=function(t){return w(t,X)?t[X]:{}},D=function(t){return w(t,X)}}var Z,$,tt={set:R,get:I,has:D,enforce:function(t){return D(t)?I(t):R(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=I(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||A(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:A(t,n,i)):c?t[n]=i:E(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||N(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=y(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,mt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=y(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,mt)}},yt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=yt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=k.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",Pt=wt.POLYFILL="P",jt=wt,xt=j.f,Mt=Array.isArray||function(t){return"Array"==p(t)},kt=function(t){return Object(d(t))},At=function(t,n,r){var e=v(n);e in t?k.f(t,e,l(0,r)):t[e]=r},Et=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Et&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=B("wks"),Rt=o.Symbol,It=_t?Rt:H,Dt=function(t){return w(Ct,t)||(Et&&w(Rt,t)?Ct[t]=Rt[t]:Ct[t]=It("Symbol."+t)),Ct[t]},Ft=Dt("species"),Nt=function(t,n){var r;return Mt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Mt(r.prototype)?h(r)&&null===(r=r[Ft])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Lt=ot("navigator","userAgent")||"",qt=o.process,Bt=qt&&qt.versions,zt=Bt&&Bt.v8;zt?$=(Z=zt.split("."))[0]+Z[1]:Lt&&(!(Z=Lt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Lt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Wt=Dt("species"),Jt=Dt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:Mt(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||E(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!jt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&A(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=kt(this),a=Nt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&At(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");At(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["id-ID"]={formatLoadingMessage:function(){return"Memuat, mohon tunggu"},formatRecordsPerPage:function(t){return"".concat(t," baris per halaman")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Menampilkan ".concat(t," sampai ").concat(n," dari ").concat(r," baris (filtered from ").concat(e," total rows)"):"Menampilkan ".concat(t," sampai ").concat(n," dari ").concat(r," baris")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Bersihkan filter"},formatSearch:function(){return"Pencarian"},formatNoMatches:function(){return"Tidak ditemukan data yang cocok"},formatPaginationSwitch:function(){return"Sembunyikan/Tampilkan halaman"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Muat ulang"},formatToggle:function(){return"Beralih"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"kolom"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Semua"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Ekspor data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["id-ID"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
index 3c6ae1ca..fa6eda6e 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["it-IT"]={formatLoadingMessage:function(){return"Caricamento in corso..."},formatRecordsPerPage:function(a){return a+" elementi per pagina"},formatShowingRows:function(a,b,c){return"Elementi mostrati da "+a+" a "+b+" (Numero totali di elementi "+c+")"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"Nessun elemento trovato"},formatPaginationSwitch:function(){return"Nascondi/Mostra paginazione"},formatRefresh:function(){return"Aggiorna"},formatToggle:function(){return"Attiva/Disattiva"},formatColumns:function(){return"Colonne"},formatAllRows:function(){return"Tutto"},formatExport:function(){return"Esporta dati"},formatClearFilters:function(){return"Pulisci filtri"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["it-IT"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,j={f:u?P:function(t,n){if(t=m(t),n=v(n,!0),T)try{return P(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),z=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return z.call(t)});var R,N,I,F,k=_.inspectSource,D=o.WeakMap,L="function"==typeof D&&/native code/.test(k(D)),q=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,V=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+V).toString(36)},H=q("keys"),W={},J=o.WeakMap;if(L){var K=new J,Q=K.get,U=K.has,Y=K.set;R=function(t,n){return Y.call(K,t,n),n},N=function(t){return Q.call(K,t)||{}},I=function(t){return U.call(K,t)}}else{var X=H[F="state"]||(H[F]=B(F));W[X]=!0,R=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},I=function(t){return w(t,X)}}var Z,$,tt={set:R,get:N,has:I,enforce:function(t){return I(t)?N(t):R(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||k(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",Pt=wt.POLYFILL="P",jt=wt,xt=j.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),zt=q("wks"),Rt=o.Symbol,Nt=_t?Rt:B,It=function(t){return w(zt,t)||(Ct&&w(Rt,t)?zt[t]=Rt[t]:zt[t]=Nt("Symbol."+t)),zt[t]},Ft=It("species"),kt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?h(r)&&null===(r=r[Ft])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",Lt=o.process,qt=Lt&&Lt.versions,Gt=qt&&qt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Vt,Bt=$&&+$,Ht=It("species"),Wt=It("isConcatSpreadable"),Jt=Bt>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Kt=(Vt="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Vt](Boolean).foo}))),Qt=function(t){if(!h(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!jt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=kt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["it-IT"]={formatLoadingMessage:function(){return"Caricamento in corso"},formatRecordsPerPage:function(t){return"".concat(t," elementi per pagina")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Visualizzazione da ".concat(t," a ").concat(n," di ").concat(r," elementi (filtered from ").concat(e," total rows)"):"Visualizzazione da ".concat(t," a ").concat(n," di ").concat(r," elementi")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Pulisci filtri"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"Nessun elemento trovato"},formatPaginationSwitch:function(){return"Nascondi/Mostra paginazione"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Aggiorna"},formatToggle:function(){return"Attiva/Disattiva"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Colonne"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Tutto"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Esporta dati"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["it-IT"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
index fae4e994..c438b5ba 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ja-JP"]={formatLoadingMessage:function(){return"読み込み中です。少々お待ちください。"},formatRecordsPerPage:function(a){return"ページ当たり最大"+a+"件"},formatShowingRows:function(a,b,c){return"全"+c+"件から、"+a+"から"+b+"件目まで表示しています"},formatSearch:function(){return"検索"},formatNoMatches:function(){return"該当するレコードが見つかりません"},formatPaginationSwitch:function(){return"ページ数を表示・非表示"},formatRefresh:function(){return"更新"},formatToggle:function(){return"トグル"},formatColumns:function(){return"列"},formatAllRows:function(){return"すべて"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ja-JP"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var F,N,k,I,L=_.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,J=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+J).toString(36)},H=z("keys"),W={},K=o.WeakMap;if(q){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;F=function(t,n){return Y.call(Q,t,n),n},N=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=H[I="state"]||(H[I]=B(I));W[X]=!0,F=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),Ft=o.Symbol,Nt=_t?Ft:B,kt=function(t){return w(Rt,t)||(Ct&&w(Ft,t)?Rt[t]=Ft[t]:Rt[t]=Nt("Symbol."+t)),Rt[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Jt,Bt=$&&+$,Ht=kt("species"),Wt=kt("isConcatSpreadable"),Kt=Bt>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Qt=(Jt="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Jt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["ja-JP"]={formatLoadingMessage:function(){return"読み込み中です。少々お待ちください。"},formatRecordsPerPage:function(t){return"ページ当たり最大".concat(t,"件")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"全".concat(r,"件から、").concat(t,"から").concat(n,"件目まで表示しています (filtered from ").concat(e," total rows)"):"全".concat(r,"件から、").concat(t,"から").concat(n,"件目まで表示しています")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"検索"},formatNoMatches:function(){return"該当するレコードが見つかりません"},formatPaginationSwitch:function(){return"ページ数を表示・非表示"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"更新"},formatToggle:function(){return"トグル"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"すべて"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ja-JP"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
index 68bfb13d..fb0b690d 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ka-GE"]={formatLoadingMessage:function(){return"იტვირთება, გთხოვთ მოიცადოთ..."},formatRecordsPerPage:function(a){return a+" ჩანაწერი თითო გვერდზე"},formatShowingRows:function(a,b,c){return"ნაჩვენებია "+a+"-დან "+b+"-მდე ჩანაწერი ჯამური "+c+"-დან"},formatSearch:function(){return"ძებნა"},formatNoMatches:function(){return"მონაცემები არ არის"},formatPaginationSwitch:function(){return"გვერდების გადამრთველის დამალვა/გამოჩენა"},formatRefresh:function(){return"განახლება"},formatToggle:function(){return"ჩართვა/გამორთვა"},formatColumns:function(){return"სვეტები"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ka-GE"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:u?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var k,F,N,I,L=_.inspectSource,D=o.WeakMap,G="function"==typeof D&&/native code/.test(L(D)),q=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,B=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+B).toString(36)},W=q("keys"),J={},K=o.WeakMap;if(G){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;k=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},N=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=H(I));J[X]=!0,k=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},N=function(t){return w(t,X)}}var Z,$,tt={set:k,get:F,has:N,enforce:function(t){return N(t)?F(t):k(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=A.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=q("wks"),kt=o.Symbol,Ft=_t?kt:H,Nt=function(t){return w(Rt,t)||(Ct&&w(kt,t)?Rt[t]=kt[t]:Rt[t]=Ft("Symbol."+t)),Rt[t]},It=Nt("species"),Lt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",Gt=o.process,qt=Gt&&Gt.versions,zt=qt&&qt.v8;zt?$=(Z=zt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Ht=$&&+$,Wt=Nt("species"),Jt=Nt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Bt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=At(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["ka-GE"]={formatLoadingMessage:function(){return"იტვირთება, გთხოვთ მოიცადოთ"},formatRecordsPerPage:function(t){return"".concat(t," ჩანაწერი თითო გვერდზე")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"ნაჩვენებია ".concat(t,"-დან ").concat(n,"-მდე ჩანაწერი ჯამური ").concat(r,"-დან (filtered from ").concat(e," total rows)"):"ნაჩვენებია ".concat(t,"-დან ").concat(n,"-მდე ჩანაწერი ჯამური ").concat(r,"-დან")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"ძებნა"},formatNoMatches:function(){return"მონაცემები არ არის"},formatPaginationSwitch:function(){return"გვერდების გადამრთველის დამალვა/გამოჩენა"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"განახლება"},formatToggle:function(){return"ჩართვა/გამორთვა"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"სვეტები"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ka-GE"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
index 4c222cf5..dfb5aaf9 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ko-KR"]={formatLoadingMessage:function(){return"데이터를 불러오는 중입니다..."},formatRecordsPerPage:function(a){return"페이지 당 "+a+"개 데이터 출력"},formatShowingRows:function(a,b,c){return"전체 "+c+"개 중 "+a+"~"+b+"번째 데이터 출력,"},formatSearch:function(){return"검색"},formatNoMatches:function(){return"조회된 데이터가 없습니다."},formatRefresh:function(){return"새로 고침"},formatToggle:function(){return"전환"},formatColumns:function(){return"컬럼 필터링"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ko-KR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},R=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var k,F,N,I,L=C.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),K=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),W={},J=o.WeakMap;if(q){var Q=new J,U=Q.get,V=Q.has,Y=Q.set;k=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},N=function(t){return V.call(Q,t)}}else{var X=B[I="state"]||(B[I]=K(I));W[X]=!0,k=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},N=function(t){return w(t,X)}}var Z,$,tt={set:k,get:F,has:N,enforce:function(t){return N(t)?F(t):k(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:R(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),kt=o.Symbol,Ft=Ct?kt:K,Nt=function(t){return w(_t,t)||(Rt&&w(kt,t)?_t[t]=kt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},It=Nt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Kt=$&&+$,Bt=Nt("species"),Wt=Nt("isConcatSpreadable"),Jt=Kt>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Qt=(Ht="concat",Kt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||R(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["ko-KR"]={formatLoadingMessage:function(){return"데이터를 불러오는 중입니다"},formatRecordsPerPage:function(t){return"페이지 당 ".concat(t,"개 데이터 출력")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"전체 ".concat(r,"개 중 ").concat(t,"~").concat(n,"번째 데이터 출력, (filtered from ").concat(e," total rows)"):"전체 ".concat(r,"개 중 ").concat(t,"~").concat(n,"번째 데이터 출력,")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"검색"},formatNoMatches:function(){return"조회된 데이터가 없습니다."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"새로 고침"},formatToggle:function(){return"전환"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"컬럼 필터링"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ko-KR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
index 7a6bcb4e..f049435c 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ms-MY"]={formatLoadingMessage:function(){return"Permintaan sedang dimuatkan. Sila tunggu sebentar..."},formatRecordsPerPage:function(a){return a+" rekod setiap muka surat"},formatShowingRows:function(a,b,c){return"Sedang memaparkan rekod "+a+" hingga "+b+" daripada jumlah "+c+" rekod"},formatSearch:function(){return"Cari"},formatNoMatches:function(){return"Tiada rekod yang menyamai permintaan"},formatPaginationSwitch:function(){return"Tunjuk/sembunyi muka surat"},formatRefresh:function(){return"Muatsemula"},formatToggle:function(){return"Tukar"},formatColumns:function(){return"Lajur"},formatAllRows:function(){return"Semua"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ms-MY"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},d="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,m=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return g(m(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,S=function(t,n){return b.call(t,n)},w=o.document,j=h(w)&&h(w.createElement),O=!u&&!i((function(){return 7!=Object.defineProperty((t="div",j?w.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,P={f:u?T:function(t,n){if(t=y(t),n=v(n,!0),O)try{return T(t,n)}catch(t){}if(S(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},k=Object.defineProperty,M={f:u?k:function(t,n,r){if(x(t),n=v(n,!0),x(r),O)try{return k(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},A=u?function(t,n,r){return M.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},E=function(t,n){try{A(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||E("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var R,F,L,N,I=C.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(I(D)),z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,Y=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+Y).toString(36)},H=z("keys"),W={},J=o.WeakMap;if(q){var K=new J,Q=K.get,U=K.has,V=K.set;R=function(t,n){return V.call(K,t,n),n},F=function(t){return Q.call(K,t)||{}},L=function(t){return U.call(K,t)}}else{var X=H[N="state"]||(H[N]=B(N));W[X]=!0,R=function(t,n){return A(t,X,n),n},F=function(t){return S(t,X)?t[X]:{}},L=function(t){return S(t,X)}}var Z,$,tt={set:R,get:F,has:L,enforce:function(t){return L(t)?F(t):R(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||S(i,"name")||A(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:A(t,n,i)):c?t[n]=i:E(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=y(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},dt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=y(t),o=0,i=[];for(r in e)!S(W,r)&&S(e,r)&&i.push(r);for(;n.length>o;)S(e,r=n[o++])&&(~dt(i,r)||i.push(r));return i}(t,gt)}},yt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=mt.f(x(t)),r=yt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=M.f,o=P.f,i=0;i<r.length;i++){var u=r[i];S(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,St=function(t,n){var r=jt[wt(t)];return r==Tt||r!=Ot&&("function"==typeof n?i(n):!!n)},wt=St.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},jt=St.data={},Ot=St.NATIVE="N",Tt=St.POLYFILL="P",Pt=St,xt=P.f,kt=Array.isArray||function(t){return"Array"==p(t)},Mt=function(t){return Object(m(t))},At=function(t,n,r){var e=v(n);e in t?M.f(t,e,l(0,r)):t[e]=r},Et=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Et&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Rt=o.Symbol,Ft=Ct?Rt:B,Lt=function(t){return S(_t,t)||(Et&&S(Rt,t)?_t[t]=Rt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},Nt=Lt("species"),It=function(t,n){var r;return kt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!kt(r.prototype)?h(r)&&null===(r=r[Nt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Yt,Bt=$&&+$,Ht=Lt("species"),Wt=Lt("isConcatSpreadable"),Jt=Bt>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Kt=(Yt="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Yt](Boolean).foo}))),Qt=function(t){if(!h(t))return!1;var n=t[Wt];return void 0!==n?!!n:kt(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||E(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&A(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=Mt(this),a=It(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&At(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");At(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["ms-MY"]={formatLoadingMessage:function(){return"Permintaan sedang dimuatkan. Sila tunggu sebentar"},formatRecordsPerPage:function(t){return"".concat(t," rekod setiap muka surat")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Sedang memaparkan rekod ".concat(t," hingga ").concat(n," daripada jumlah ").concat(r," rekod (filtered from ").concat(e," total rows)"):"Sedang memaparkan rekod ".concat(t," hingga ").concat(n," daripada jumlah ").concat(r," rekod")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cari"},formatNoMatches:function(){return"Tiada rekod yang menyamai permintaan"},formatPaginationSwitch:function(){return"Tunjuk/sembunyi muka surat"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Muatsemula"},formatToggle:function(){return"Tukar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Lajur"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Semua"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ms-MY"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
index 9853b417..dccc4acc 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["nb-NO"]={formatLoadingMessage:function(){return"Oppdaterer, vennligst vent..."},formatRecordsPerPage:function(a){return a+" poster pr side"},formatShowingRows:function(a,b,c){return"Viser "+a+" til "+b+" av "+c+" rekker"},formatSearch:function(){return"Søk"},formatNoMatches:function(){return"Ingen poster funnet"},formatRefresh:function(){return"Oppdater"},formatToggle:function(){return"Endre"},formatColumns:function(){return"Kolonner"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nb-NO"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return d(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},k=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||k("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var R,N,F,I,L=C.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),V=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),K={},W=o.WeakMap;if(q){var J=new W,Q=J.get,U=J.has,Y=J.set;R=function(t,n){return Y.call(J,t,n),n},N=function(t){return Q.call(J,t)||{}},F=function(t){return U.call(J,t)}}else{var X=B[I="state"]||(B[I]=V(I));K[X]=!0,R=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:R,get:N,has:F,enforce:function(t){return F(t)?N(t):R(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},kt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=kt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Rt=o.Symbol,Nt=Ct?Rt:V,Ft=function(t){return w(_t,t)||(kt&&w(Rt,t)?_t[t]=Rt[t]:_t[t]=Nt("Symbol."+t)),_t[t]},It=Ft("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Vt=$&&+$,Bt=Ft("species"),Kt=Ft("isConcatSpreadable"),Wt=Vt>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Jt=(Ht="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Kt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||k(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["nb-NO"]={formatLoadingMessage:function(){return"Oppdaterer, vennligst vent"},formatRecordsPerPage:function(t){return"".concat(t," poster pr side")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Viser ".concat(t," til ").concat(n," av ").concat(r," rekker (filtered from ").concat(e," total rows)"):"Viser ".concat(t," til ").concat(n," av ").concat(r," rekker")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Søk"},formatNoMatches:function(){return"Ingen poster funnet"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Oppdater"},formatToggle:function(){return"Endre"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolonner"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["nb-NO"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
new file mode 100644
index 00000000..650347df
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?t(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],t):t((n=n||self).jQuery)}(this,(function(n){"use strict";n=n&&n.hasOwnProperty("default")?n.default:n;var t="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(n,t){return n(t={exports:{}},t.exports),t.exports}var r=function(n){return n&&n.Math==Math&&n},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof t&&t)||Function("return this")(),i=function(n){try{return!!n()}catch(n){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,a=Object.getOwnPropertyDescriptor,f={f:a&&!c.call({1:2},1)?function(n){var t=a(this,n);return!!t&&t.enumerable}:c},l=function(n,t){return{enumerable:!(1&n),configurable:!(2&n),writable:!(4&n),value:t}},s={}.toString,p=function(n){return s.call(n).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(n){return"String"==p(n)?g.call(n,""):Object(n)}:Object,y=function(n){if(null==n)throw TypeError("Can't call method on "+n);return n},m=function(n){return d(y(n))},h=function(n){return"object"==typeof n?null!==n:"function"==typeof n},v=function(n,t){if(!h(n))return n;var e,r;if(t&&"function"==typeof(e=n.toString)&&!h(r=e.call(n)))return r;if("function"==typeof(e=n.valueOf)&&!h(r=e.call(n)))return r;if(!t&&"function"==typeof(e=n.toString)&&!h(r=e.call(n)))return r;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(n,t){return b.call(n,t)},S=o.document,T=h(S)&&h(S.createElement),O=!u&&!i((function(){return 7!=Object.defineProperty((n="div",T?S.createElement(n):{}),"a",{get:function(){return 7}}).a;var n})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(n,t){if(n=m(n),t=v(t,!0),O)try{return j(n,t)}catch(n){}if(w(n,t))return l(!f.f.call(n,t),n[t])}},x=function(n){if(!h(n))throw TypeError(String(n)+" is not an object");return n},A=Object.defineProperty,E={f:u?A:function(n,t,e){if(x(n),t=v(t,!0),x(e),O)try{return A(n,t,e)}catch(n){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(n[t]=e.value),n}},M=u?function(n,t,e){return E.f(n,t,l(1,e))}:function(n,t,e){return n[t]=e,n},k=function(n,t){try{M(o,n,t)}catch(e){o[n]=t}return t},_=o["__core-js_shared__"]||k("__core-js_shared__",{}),C=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(n){return C.call(n)});var R,L,N,V,F=_.inspectSource,I=o.WeakMap,D="function"==typeof I&&/native code/.test(F(I)),G=e((function(n){(n.exports=function(n,t){return _[n]||(_[n]=void 0!==t?t:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),q=0,z=Math.random(),B=function(n){return"Symbol("+String(void 0===n?"":n)+")_"+(++q+z).toString(36)},K=G("keys"),W={},J=o.WeakMap;if(D){var Q=new J,U=Q.get,Y=Q.has,Z=Q.set;R=function(n,t){return Z.call(Q,n,t),t},L=function(n){return U.call(Q,n)||{}},N=function(n){return Y.call(Q,n)}}else{var H=K[V="state"]||(K[V]=B(V));W[H]=!0,R=function(n,t){return M(n,H,t),t},L=function(n){return w(n,H)?n[H]:{}},N=function(n){return w(n,H)}}var X,$,nn={set:R,get:L,has:N,enforce:function(n){return N(n)?L(n):R(n,{})},getterFor:function(n){return function(t){var e;if(!h(t)||(e=L(t)).type!==n)throw TypeError("Incompatible receiver, "+n+" required");return e}}},tn=e((function(n){var t=nn.get,e=nn.enforce,r=String(String).split("String");(n.exports=function(n,t,i,u){var c=!!u&&!!u.unsafe,a=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof t||w(i,"name")||M(i,"name",t),e(i).source=r.join("string"==typeof t?t:"")),n!==o?(c?!f&&n[t]&&(a=!0):delete n[t],a?n[t]=i:M(n,t,i)):a?n[t]=i:k(t,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&t(this).source||F(this)}))})),en=o,rn=function(n){return"function"==typeof n?n:void 0},on=function(n,t){return arguments.length<2?rn(en[n])||rn(o[n]):en[n]&&en[n][t]||o[n]&&o[n][t]},un=Math.ceil,cn=Math.floor,an=function(n){return isNaN(n=+n)?0:(n>0?cn:un)(n)},fn=Math.min,ln=function(n){return n>0?fn(an(n),9007199254740991):0},sn=Math.max,pn=Math.min,gn=function(n){return function(t,e,r){var o,i=m(t),u=ln(i.length),c=function(n,t){var e=an(n);return e<0?sn(e+t,0):pn(e,t)}(r,u);if(n&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((n||c in i)&&i[c]===e)return n||c||0;return!n&&-1}},dn={includes:gn(!0),indexOf:gn(!1)}.indexOf,yn=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),mn={f:Object.getOwnPropertyNames||function(n){return function(n,t){var e,r=m(n),o=0,i=[];for(e in r)!w(W,e)&&w(r,e)&&i.push(e);for(;t.length>o;)w(r,e=t[o++])&&(~dn(i,e)||i.push(e));return i}(n,yn)}},hn={f:Object.getOwnPropertySymbols},vn=on("Reflect","ownKeys")||function(n){var t=mn.f(x(n)),e=hn.f;return e?t.concat(e(n)):t},bn=function(n,t){for(var e=vn(t),r=E.f,o=P.f,i=0;i<e.length;i++){var u=e[i];w(n,u)||r(n,u,o(t,u))}},wn=/#|\.prototype\./,Sn=function(n,t){var e=On[Tn(n)];return e==Pn||e!=jn&&("function"==typeof t?i(t):!!t)},Tn=Sn.normalize=function(n){return String(n).replace(wn,".").toLowerCase()},On=Sn.data={},jn=Sn.NATIVE="N",Pn=Sn.POLYFILL="P",xn=Sn,An=P.f,En=Array.isArray||function(n){return"Array"==p(n)},Mn=function(n){return Object(y(n))},kn=function(n,t,e){var r=v(t);r in n?E.f(n,r,l(0,e)):n[r]=e},_n=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Cn=_n&&!Symbol.sham&&"symbol"==typeof Symbol(),Rn=G("wks"),Ln=o.Symbol,Nn=Cn?Ln:B,Vn=function(n){return w(Rn,n)||(_n&&w(Ln,n)?Rn[n]=Ln[n]:Rn[n]=Nn("Symbol."+n)),Rn[n]},Fn=Vn("species"),In=function(n,t){var e;return En(n)&&("function"!=typeof(e=n.constructor)||e!==Array&&!En(e.prototype)?h(e)&&null===(e=e[Fn])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===t?0:t)},Dn=on("navigator","userAgent")||"",Gn=o.process,qn=Gn&&Gn.versions,zn=qn&&qn.v8;zn?$=(X=zn.split("."))[0]+X[1]:Dn&&(!(X=Dn.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Dn.match(/Chrome\/(\d+)/))&&($=X[1]);var Bn,Kn=$&&+$,Wn=Vn("species"),Jn=Vn("isConcatSpreadable"),Qn=Kn>=51||!i((function(){var n=[];return n[Jn]=!1,n.concat()[0]!==n})),Un=(Bn="concat",Kn>=51||!i((function(){var n=[];return(n.constructor={})[Wn]=function(){return{foo:1}},1!==n[Bn](Boolean).foo}))),Yn=function(n){if(!h(n))return!1;var t=n[Jn];return void 0!==t?!!t:En(n)};!function(n,t){var e,r,i,u,c,a=n.target,f=n.global,l=n.stat;if(e=f?o:l?o[a]||k(a,{}):(o[a]||{}).prototype)for(r in t){if(u=t[r],i=n.noTargetGet?(c=An(e,r))&&c.value:e[r],!xn(f?r:a+(l?".":"#")+r,n.forced)&&void 0!==i){if(typeof u==typeof i)continue;bn(u,i)}(n.sham||i&&i.sham)&&M(u,"sham",!0),tn(e,r,u,n)}}({target:"Array",proto:!0,forced:!Qn||!Un},{concat:function(n){var t,e,r,o,i,u=Mn(this),c=In(u,0),a=0;for(t=-1,r=arguments.length;t<r;t++)if(i=-1===t?u:arguments[t],Yn(i)){if(a+(o=ln(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(e=0;e<o;e++,a++)e in i&&kn(c,a,i[e])}else{if(a>=9007199254740991)throw TypeError("Maximum allowed index exceeded");kn(c,a++,i)}return c.length=a,c}}),n.fn.bootstrapTable.locales["nl-BE"]={formatLoadingMessage:function(){return"Laden, even geduld"},formatRecordsPerPage:function(n){return"".concat(n," records per pagina")},formatShowingRows:function(n,t,e,r){return void 0!==r&&r>0&&r>e?"Toon ".concat(n," tot ").concat(t," van ").concat(e," record").concat(e>1?"s":""," (gefilterd van ").concat(r," records in totaal)"):"Toon ".concat(n," tot ").concat(t," van ").concat(e," record").concat(e>1?"s":"")},formatSRPaginationPreText:function(){return"vorige pagina"},formatSRPaginationPageText:function(n){return"tot pagina ".concat(n)},formatSRPaginationNextText:function(){return"volgende pagina"},formatDetailPagination:function(n){return"Toon ".concat(n," record").concat(n>1?"s":"")},formatClearSearch:function(){return"Verwijder filters"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"},formatPaginationSwitch:function(){return"Verberg/Toon paginering"},formatPaginationSwitchDown:function(){return"Toon paginering"},formatPaginationSwitchUp:function(){return"Verberg paginering"},formatRefresh:function(){return"Vernieuwen"},formatToggle:function(){return"Omschakelen"},formatToggleOn:function(){return"Toon kaartweergave"},formatToggleOff:function(){return"Verberg kaartweergave"},formatColumns:function(){return"Kolommen"},formatColumnsToggleAll:function(){return"Allen omschakelen"},formatFullscreen:function(){return"Volledig scherm"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisch vernieuwen"},formatExport:function(){return"Exporteer gegevens"},formatJumpTo:function(){return"GA"},formatAdvancedSearch:function(){return"Geavanceerd zoeken"},formatAdvancedCloseButton:function(){return"Sluiten"}},n.extend(n.fn.bootstrapTable.defaults,n.fn.bootstrapTable.locales["nl-BE"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
index dc24dc67..82ce5dd1 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld..."},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" record"+(c>1?"s":"")},formatDetailPagination:function(a){return"Toon "+a+" record"+(a>1?"s":"")},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"},formatRefresh:function(){return"Vernieuwen"},formatToggle:function(){return"Omschakelen"},formatColumns:function(){return"Kolommen"},formatAllRows:function(){return"Alle"},formatPaginationSwitch:function(){return"Verberg/Toon paginatie"},formatExport:function(){return"Exporteer data"},formatClearFilters:function(){return"Verwijder filters"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nl-NL"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?t(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],t):t((n=n||self).jQuery)}(this,(function(n){"use strict";n=n&&n.hasOwnProperty("default")?n.default:n;var t="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(n,t){return n(t={exports:{}},t.exports),t.exports}var r=function(n){return n&&n.Math==Math&&n},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof t&&t)||Function("return this")(),i=function(n){try{return!!n()}catch(n){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,a=Object.getOwnPropertyDescriptor,f={f:a&&!c.call({1:2},1)?function(n){var t=a(this,n);return!!t&&t.enumerable}:c},l=function(n,t){return{enumerable:!(1&n),configurable:!(2&n),writable:!(4&n),value:t}},s={}.toString,p=function(n){return s.call(n).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(n){return"String"==p(n)?g.call(n,""):Object(n)}:Object,y=function(n){if(null==n)throw TypeError("Can't call method on "+n);return n},m=function(n){return d(y(n))},h=function(n){return"object"==typeof n?null!==n:"function"==typeof n},v=function(n,t){if(!h(n))return n;var e,r;if(t&&"function"==typeof(e=n.toString)&&!h(r=e.call(n)))return r;if("function"==typeof(e=n.valueOf)&&!h(r=e.call(n)))return r;if(!t&&"function"==typeof(e=n.toString)&&!h(r=e.call(n)))return r;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(n,t){return b.call(n,t)},S=o.document,T=h(S)&&h(S.createElement),O=!u&&!i((function(){return 7!=Object.defineProperty((n="div",T?S.createElement(n):{}),"a",{get:function(){return 7}}).a;var n})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(n,t){if(n=m(n),t=v(t,!0),O)try{return j(n,t)}catch(n){}if(w(n,t))return l(!f.f.call(n,t),n[t])}},x=function(n){if(!h(n))throw TypeError(String(n)+" is not an object");return n},A=Object.defineProperty,E={f:u?A:function(n,t,e){if(x(n),t=v(t,!0),x(e),O)try{return A(n,t,e)}catch(n){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(n[t]=e.value),n}},M=u?function(n,t,e){return E.f(n,t,l(1,e))}:function(n,t,e){return n[t]=e,n},k=function(n,t){try{M(o,n,t)}catch(e){o[n]=t}return t},_=o["__core-js_shared__"]||k("__core-js_shared__",{}),C=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(n){return C.call(n)});var L,N,R,V,F=_.inspectSource,I=o.WeakMap,D="function"==typeof I&&/native code/.test(F(I)),G=e((function(n){(n.exports=function(n,t){return _[n]||(_[n]=void 0!==t?t:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),q=0,z=Math.random(),B=function(n){return"Symbol("+String(void 0===n?"":n)+")_"+(++q+z).toString(36)},K=G("keys"),W={},J=o.WeakMap;if(D){var Q=new J,U=Q.get,Y=Q.has,Z=Q.set;L=function(n,t){return Z.call(Q,n,t),t},N=function(n){return U.call(Q,n)||{}},R=function(n){return Y.call(Q,n)}}else{var H=K[V="state"]||(K[V]=B(V));W[H]=!0,L=function(n,t){return M(n,H,t),t},N=function(n){return w(n,H)?n[H]:{}},R=function(n){return w(n,H)}}var X,$,nn={set:L,get:N,has:R,enforce:function(n){return R(n)?N(n):L(n,{})},getterFor:function(n){return function(t){var e;if(!h(t)||(e=N(t)).type!==n)throw TypeError("Incompatible receiver, "+n+" required");return e}}},tn=e((function(n){var t=nn.get,e=nn.enforce,r=String(String).split("String");(n.exports=function(n,t,i,u){var c=!!u&&!!u.unsafe,a=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof t||w(i,"name")||M(i,"name",t),e(i).source=r.join("string"==typeof t?t:"")),n!==o?(c?!f&&n[t]&&(a=!0):delete n[t],a?n[t]=i:M(n,t,i)):a?n[t]=i:k(t,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&t(this).source||F(this)}))})),en=o,rn=function(n){return"function"==typeof n?n:void 0},on=function(n,t){return arguments.length<2?rn(en[n])||rn(o[n]):en[n]&&en[n][t]||o[n]&&o[n][t]},un=Math.ceil,cn=Math.floor,an=function(n){return isNaN(n=+n)?0:(n>0?cn:un)(n)},fn=Math.min,ln=function(n){return n>0?fn(an(n),9007199254740991):0},sn=Math.max,pn=Math.min,gn=function(n){return function(t,e,r){var o,i=m(t),u=ln(i.length),c=function(n,t){var e=an(n);return e<0?sn(e+t,0):pn(e,t)}(r,u);if(n&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((n||c in i)&&i[c]===e)return n||c||0;return!n&&-1}},dn={includes:gn(!0),indexOf:gn(!1)}.indexOf,yn=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),mn={f:Object.getOwnPropertyNames||function(n){return function(n,t){var e,r=m(n),o=0,i=[];for(e in r)!w(W,e)&&w(r,e)&&i.push(e);for(;t.length>o;)w(r,e=t[o++])&&(~dn(i,e)||i.push(e));return i}(n,yn)}},hn={f:Object.getOwnPropertySymbols},vn=on("Reflect","ownKeys")||function(n){var t=mn.f(x(n)),e=hn.f;return e?t.concat(e(n)):t},bn=function(n,t){for(var e=vn(t),r=E.f,o=P.f,i=0;i<e.length;i++){var u=e[i];w(n,u)||r(n,u,o(t,u))}},wn=/#|\.prototype\./,Sn=function(n,t){var e=On[Tn(n)];return e==Pn||e!=jn&&("function"==typeof t?i(t):!!t)},Tn=Sn.normalize=function(n){return String(n).replace(wn,".").toLowerCase()},On=Sn.data={},jn=Sn.NATIVE="N",Pn=Sn.POLYFILL="P",xn=Sn,An=P.f,En=Array.isArray||function(n){return"Array"==p(n)},Mn=function(n){return Object(y(n))},kn=function(n,t,e){var r=v(t);r in n?E.f(n,r,l(0,e)):n[r]=e},_n=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Cn=_n&&!Symbol.sham&&"symbol"==typeof Symbol(),Ln=G("wks"),Nn=o.Symbol,Rn=Cn?Nn:B,Vn=function(n){return w(Ln,n)||(_n&&w(Nn,n)?Ln[n]=Nn[n]:Ln[n]=Rn("Symbol."+n)),Ln[n]},Fn=Vn("species"),In=function(n,t){var e;return En(n)&&("function"!=typeof(e=n.constructor)||e!==Array&&!En(e.prototype)?h(e)&&null===(e=e[Fn])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===t?0:t)},Dn=on("navigator","userAgent")||"",Gn=o.process,qn=Gn&&Gn.versions,zn=qn&&qn.v8;zn?$=(X=zn.split("."))[0]+X[1]:Dn&&(!(X=Dn.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Dn.match(/Chrome\/(\d+)/))&&($=X[1]);var Bn,Kn=$&&+$,Wn=Vn("species"),Jn=Vn("isConcatSpreadable"),Qn=Kn>=51||!i((function(){var n=[];return n[Jn]=!1,n.concat()[0]!==n})),Un=(Bn="concat",Kn>=51||!i((function(){var n=[];return(n.constructor={})[Wn]=function(){return{foo:1}},1!==n[Bn](Boolean).foo}))),Yn=function(n){if(!h(n))return!1;var t=n[Jn];return void 0!==t?!!t:En(n)};!function(n,t){var e,r,i,u,c,a=n.target,f=n.global,l=n.stat;if(e=f?o:l?o[a]||k(a,{}):(o[a]||{}).prototype)for(r in t){if(u=t[r],i=n.noTargetGet?(c=An(e,r))&&c.value:e[r],!xn(f?r:a+(l?".":"#")+r,n.forced)&&void 0!==i){if(typeof u==typeof i)continue;bn(u,i)}(n.sham||i&&i.sham)&&M(u,"sham",!0),tn(e,r,u,n)}}({target:"Array",proto:!0,forced:!Qn||!Un},{concat:function(n){var t,e,r,o,i,u=Mn(this),c=In(u,0),a=0;for(t=-1,r=arguments.length;t<r;t++)if(i=-1===t?u:arguments[t],Yn(i)){if(a+(o=ln(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(e=0;e<o;e++,a++)e in i&&kn(c,a,i[e])}else{if(a>=9007199254740991)throw TypeError("Maximum allowed index exceeded");kn(c,a++,i)}return c.length=a,c}}),n.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld"},formatRecordsPerPage:function(n){return"".concat(n," records per pagina")},formatShowingRows:function(n,t,e,r){return void 0!==r&&r>0&&r>e?"Toon ".concat(n," tot ").concat(t," van ").concat(e," record").concat(e>1?"s":""," (gefilterd van ").concat(r," records in totaal)"):"Toon ".concat(n," tot ").concat(t," van ").concat(e," record").concat(e>1?"s":"")},formatSRPaginationPreText:function(){return"vorige pagina"},formatSRPaginationPageText:function(n){return"tot pagina ".concat(n)},formatSRPaginationNextText:function(){return"volgende pagina"},formatDetailPagination:function(n){return"Toon ".concat(n," record").concat(n>1?"s":"")},formatClearSearch:function(){return"Verwijder filters"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"},formatPaginationSwitch:function(){return"Verberg/Toon paginering"},formatPaginationSwitchDown:function(){return"Toon paginering"},formatPaginationSwitchUp:function(){return"Verberg paginering"},formatRefresh:function(){return"Vernieuwen"},formatToggle:function(){return"Omschakelen"},formatToggleOn:function(){return"Toon kaartweergave"},formatToggleOff:function(){return"Verberg kaartweergave"},formatColumns:function(){return"Kolommen"},formatColumnsToggleAll:function(){return"Allen omschakelen"},formatFullscreen:function(){return"Volledig scherm"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisch vernieuwen"},formatExport:function(){return"Exporteer gegevens"},formatJumpTo:function(){return"GA"},formatAdvancedSearch:function(){return"Geavanceerd zoeken"},formatAdvancedCloseButton:function(){return"Sluiten"}},n.extend(n.fn.bootstrapTable.defaults,n.fn.bootstrapTable.locales["nl-NL"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
index 6a8f2d21..9d485033 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["pl-PL"]={formatLoadingMessage:function(){return"Ładowanie, proszę czekać..."},formatRecordsPerPage:function(a){return a+" rekordów na stronę"},formatShowingRows:function(a,b,c){return"Wyświetlanie rekordów od "+a+" do "+b+" z "+c},formatSearch:function(){return"Szukaj"},formatNoMatches:function(){return"Niestety, nic nie znaleziono"},formatRefresh:function(){return"Odśwież"},formatToggle:function(){return"Przełącz"},formatColumns:function(){return"Kolumny"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["pl-PL"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,a=Object.getOwnPropertyDescriptor,f={f:a&&!c.call({1:2},1)?function(t){var n=a(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},d="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(g(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,T={f:u?j:function(t,n){if(t=h(t),n=v(n,!0),P)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},z=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},k=o["__core-js_shared__"]||z("__core-js_shared__",{}),C=Function.toString;"function"!=typeof k.inspectSource&&(k.inspectSource=function(t){return C.call(t)});var _,R,L,N,F=k.inspectSource,I=o.WeakMap,D="function"==typeof I&&/native code/.test(F(I)),q=r((function(t){(t.exports=function(t,n){return k[t]||(k[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),W=0,G=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++W+G).toString(36)},B=q("keys"),K={},J=o.WeakMap;if(D){var Q=new J,U=Q.get,V=Q.has,Y=Q.set;_=function(t,n){return Y.call(Q,t,n),n},R=function(t){return U.call(Q,t)||{}},L=function(t){return V.call(Q,t)}}else{var X=B[N="state"]||(B[N]=H(N));K[X]=!0,_=function(t,n){return M(t,X,n),n},R=function(t){return w(t,X)?t[X]:{}},L=function(t){return w(t,X)}}var Z,$,tt={set:_,get:R,has:L,enforce:function(t){return L(t)?R(t):_(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,a=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!f&&t[n]&&(a=!0):delete t[n],a?t[n]=i:M(t,n,i)):a?t[n]=i:z(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||F(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},at=Math.min,ft=function(t){return t>0?at(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ft(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},dt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),gt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~dt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=gt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",jt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(g(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},zt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),kt=zt&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=q("wks"),_t=o.Symbol,Rt=kt?_t:H,Lt=function(t){return w(Ct,t)||(zt&&w(_t,t)?Ct[t]=_t[t]:Ct[t]=Rt("Symbol."+t)),Ct[t]},Nt=Lt("species"),Ft=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[Nt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},It=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Wt=qt&&qt.v8;Wt?$=(Z=Wt.split("."))[0]+Z[1]:It&&(!(Z=It.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=It.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Ht=$&&+$,Bt=Lt("species"),Kt=Lt("isConcatSpreadable"),Jt=Ht>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Kt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,a=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[a]||z(a,{}):(o[a]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(f?e:a+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Ft(u,0),a=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(a+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,a++)r in i&&Mt(c,a,i[r])}else{if(a>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,a++,i)}return c.length=a,c}}),t.fn.bootstrapTable.locales["pl-PL"]={formatLoadingMessage:function(){return"Ładowanie, proszę czekać"},formatRecordsPerPage:function(t){return"".concat(t," rekordów na stronę")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Wyświetlanie rekordów od ".concat(t," do ").concat(n," z ").concat(r," (filtered from ").concat(e," total rows)"):"Wyświetlanie rekordów od ".concat(t," do ").concat(n," z ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Szukaj"},formatNoMatches:function(){return"Niestety, nic nie znaleziono"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Odśwież"},formatToggle:function(){return"Przełącz"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolumny"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["pl-PL"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
index 28e81490..a1dbf48d 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["pt-BR"]={formatLoadingMessage:function(){return"Carregando, aguarde..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Exibindo "+a+" até "+b+" de "+c+" linhas"},formatSearch:function(){return"Pesquisar"},formatRefresh:function(){return"Recarregar"},formatToggle:function(){return"Alternar"},formatColumns:function(){return"Colunas"},formatPaginationSwitch:function(){return"Ocultar/Exibir paginação"},formatNoMatches:function(){return"Nenhum registro encontrado"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["pt-BR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,P=h(S)&&h(S.createElement),O=!u&&!i((function(){return 7!=Object.defineProperty((t="div",P?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=m(t),n=v(n,!0),O)try{return T(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:u?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),O)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},R=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),_=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return _.call(t)});var N,q,F,I,L=C.inspectSource,k=o.WeakMap,D="function"==typeof k&&/native code/.test(L(k)),z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},H=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},q=function(t){return U.call(Q,t)||{}},F=function(t){return V.call(Q,t)}}else{var X=H[I="state"]||(H[I]=W(I));J[X]=!0,N=function(t,n){return M(t,X,n),n},q=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:N,get:q,has:F,enforce:function(t){return F(t)?q(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=q(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:R(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Pt[St(t)];return r==Tt||r!=Ot&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Pt=wt.data={},Ot=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,qt=Ct?Nt:W,Ft=function(t){return w(_t,t)||(Rt&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=qt("Symbol."+t)),_t[t]},It=Ft("species"),Lt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},kt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:kt&&(!(Z=kt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=kt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Wt=$&&+$,Ht=Ft("species"),Jt=Ft("isConcatSpreadable"),Kt=Wt>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Wt>=51||!i((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||R(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!jt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=At(this),a=Lt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["pt-BR"]={formatLoadingMessage:function(){return"Carregando, aguarde"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Exibindo ".concat(t," até ").concat(n," de ").concat(r," linhas (filtered from ").concat(e," total rows)"):"Exibindo ".concat(t," até ").concat(n," de ").concat(r," linhas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"Para a página ".concat(t)},formatSRPaginationNextText:function(){return"próxima página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," linhas")},formatClearSearch:function(){return"Limpar Pesquisa"},formatSearch:function(){return"Pesquisar"},formatNoMatches:function(){return"Nenhum registro encontrado"},formatPaginationSwitch:function(){return"Ocultar/Exibir paginação"},formatPaginationSwitchDown:function(){return"Mostrar Paginação"},formatPaginationSwitchUp:function(){return"Esconder Paginação"},formatRefresh:function(){return"Recarregar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Colunas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Tela cheia"},formatAllRows:function(){return"Tudo"},formatAutoRefresh:function(){return"Atualização Automática"},formatExport:function(){return"Exportar dados"},formatJumpTo:function(){return"IR"},formatAdvancedSearch:function(){return"Pesquisa Avançada"},formatAdvancedCloseButton:function(){return"Fechar"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["pt-BR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
index d7941bdd..116696e8 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["pt-PT"]={formatLoadingMessage:function(){return"A carregar, por favor aguarde..."},formatRecordsPerPage:function(a){return a+" registos por p&aacute;gina"},formatShowingRows:function(a,b,c){return"A mostrar "+a+" at&eacute; "+b+" de "+c+" linhas"},formatSearch:function(){return"Pesquisa"},formatNoMatches:function(){return"Nenhum registo encontrado"},formatPaginationSwitch:function(){return"Esconder/Mostrar pagina&ccedil&atilde;o"},formatRefresh:function(){return"Atualizar"},formatToggle:function(){return"Alternar"},formatColumns:function(){return"Colunas"},formatAllRows:function(){return"Tudo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["pt-PT"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return d(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),T=Object.getOwnPropertyDescriptor,j={f:u?T:function(t,n){if(t=h(t),n=v(n,!0),P)try{return T(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var N,F,k,I,L=_.inspectSource,q=o.WeakMap,D="function"==typeof q&&/native code/.test(L(q)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,B=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+B).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(D){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=H(I));J[X]=!0,N=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:N,get:F,has:k,enforce:function(t){return k(t)?F(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=j.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Tt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",Tt=wt.POLYFILL="P",jt=wt,xt=j.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),Nt=o.Symbol,Ft=_t?Nt:H,kt=function(t){return w(Rt,t)||(Ct&&w(Nt,t)?Rt[t]=Nt[t]:Rt[t]=Ft("Symbol."+t)),Rt[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},qt=ot("navigator","userAgent")||"",Dt=o.process,zt=Dt&&Dt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:qt&&(!(Z=qt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=qt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Ht=$&&+$,Wt=kt("species"),Jt=kt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Bt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!jt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=Lt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["pt-PT"]={formatLoadingMessage:function(){return"A carregar, por favor aguarde"},formatRecordsPerPage:function(t){return"".concat(t," registos por p&aacute;gina")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"A mostrar ".concat(t," at&eacute; ").concat(n," de ").concat(r," linhas (filtered from ").concat(e," total rows)"):"A mostrar ".concat(t," at&eacute; ").concat(n," de ").concat(r," linhas")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Pesquisa"},formatNoMatches:function(){return"Nenhum registo encontrado"},formatPaginationSwitch:function(){return"Esconder/Mostrar pagina&ccedil&atilde;o"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Atualizar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Colunas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Tudo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["pt-PT"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
index e394c8da..bb25bc7f 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ro-RO"]={formatLoadingMessage:function(){return"Se incarca, va rugam asteptati..."},formatRecordsPerPage:function(a){return a+" inregistrari pe pagina"},formatShowingRows:function(a,b,c){return"Arata de la "+a+" pana la "+b+" din "+c+" randuri"},formatSearch:function(){return"Cauta"},formatNoMatches:function(){return"Nu au fost gasite inregistrari"},formatPaginationSwitch:function(){return"Ascunde/Arata paginatia"},formatRefresh:function(){return"Reincarca"},formatToggle:function(){return"Comuta"},formatColumns:function(){return"Coloane"},formatAllRows:function(){return"Toate"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ro-RO"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),u={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!u.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:u},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return d(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!a&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:a?j:function(t,n){if(t=m(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:a?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},C=a?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{C(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,F,k,I,L=R.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,B=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+B).toString(36)},W=z("keys"),J={},K=o.WeakMap;if(q){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;N=function(t,n){return Y.call(Q,t,n),n},F=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=H(I));J[X]=!0,N=function(t,n){return C(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:N,get:F,has:k,enforce:function(t){return k(t)?F(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,a){var u=!!a&&!!a.unsafe,c=!!a&&!!a.enumerable,f=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||C(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(u?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:C(t,n,i)):c?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,at=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?at:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(ut(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),a=ft(i.length),u=function(t,n){var r=ut(t);return r<0?lt(r+n,0):st(r,n)}(e,a);if(t&&r!=r){for(;a>u;)if((o=i[u++])!=o)return!0}else for(;a>u;u++)if((t||u in i)&&i[u]===r)return t||u||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,dt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=E.f,o=P.f,i=0;i<r.length;i++){var a=r[i];w(t,a)||e(t,a,o(n,a))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Ct=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,Ft=Rt?Nt:H,kt=function(t){return w(_t,t)||(Mt&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=Ft("Symbol."+t)),_t[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Ht=$&&+$,Wt=kt("species"),Jt=kt("isConcatSpreadable"),Kt=Ht>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Bt="concat",Ht>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Ut=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,a,u,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||M(c,{}):(o[c]||{}).prototype)for(e in n){if(a=n[e],i=t.noTargetGet?(u=xt(r,e))&&u.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;vt(a,i)}(t.sham||i&&i.sham)&&C(a,"sham",!0),nt(r,e,a,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,a=Et(this),u=Lt(a,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?a:arguments[n],Ut(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Ct(u,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Ct(u,c++,i)}return u.length=c,u}}),t.fn.bootstrapTable.locales["ro-RO"]={formatLoadingMessage:function(){return"Se incarca, va rugam asteptati"},formatRecordsPerPage:function(t){return"".concat(t," inregistrari pe pagina")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Arata de la ".concat(t," pana la ").concat(n," din ").concat(r," randuri (filtered from ").concat(e," total rows)"):"Arata de la ".concat(t," pana la ").concat(n," din ").concat(r," randuri")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cauta"},formatNoMatches:function(){return"Nu au fost gasite inregistrari"},formatPaginationSwitch:function(){return"Ascunde/Arata paginatia"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Reincarca"},formatToggle:function(){return"Comuta"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Coloane"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Toate"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ro-RO"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
index 52b63e46..62c966e4 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ru-RU"]={formatLoadingMessage:function(){return"Пожалуйста, подождите, идёт загрузка..."},formatRecordsPerPage:function(a){return a+" записей на страницу"},formatShowingRows:function(a,b,c){return"Записи с "+a+" по "+b+" из "+c},formatSearch:function(){return"Поиск"},formatNoMatches:function(){return"Ничего не найдено"},formatRefresh:function(){return"Обновить"},formatToggle:function(){return"Переключить"},formatColumns:function(){return"Колонки"},formatClearFilters:function(){return"Очистить фильтры"},formatMultipleSort:function(){return"Множественная сортировка"},formatAddLevel:function(){return"Добавить уровень"},formatDeleteLevel:function(){return"Удалить уровень"},formatColumn:function(){return"Колонка"},formatOrder:function(){return"Порядок"},formatSortBy:function(){return"Сортировать по"},formatThenBy:function(){return"затем по"},formatSort:function(){return"Сортировать"},formatCancel:function(){return"Отмена"},formatDuplicateAlertTitle:function(){return"Дублирование колонок!"},formatDuplicateAlertDescription:function(){return"Удалите, пожалуйста, дублирующую колонку, или замените ее на другую."}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ru-RU"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},R=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||R("__core-js_shared__",{}),C=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return C.call(t)});var F,N,k,I,L=_.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),W={},J=o.WeakMap;if(q){var K=new J,Q=K.get,V=K.has,Y=K.set;F=function(t,n){return Y.call(K,t,n),n},N=function(t){return Q.call(K,t)||{}},k=function(t){return V.call(K,t)}}else{var X=B[I="state"]||(B[I]=U(I));W[X]=!0,F=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:R(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=z("wks"),Ft=o.Symbol,Nt=_t?Ft:U,kt=function(t){return w(Ct,t)||(Rt&&w(Ft,t)?Ct[t]=Ft[t]:Ct[t]=Nt("Symbol."+t)),Ct[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Ut=$&&+$,Bt=kt("species"),Wt=kt("isConcatSpreadable"),Jt=Ut>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Kt=(Ht="concat",Ut>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||R(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["ru-RU"]={formatLoadingMessage:function(){return"Пожалуйста, подождите, идёт загрузка"},formatRecordsPerPage:function(t){return"".concat(t," записей на страницу")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Записи с ".concat(t," по ").concat(n," из ").concat(r," (filtered from ").concat(e," total rows)"):"Записи с ".concat(t," по ").concat(n," из ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Очистить фильтры"},formatSearch:function(){return"Поиск"},formatNoMatches:function(){return"Ничего не найдено"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Обновить"},formatToggle:function(){return"Переключить"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Колонки"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ru-RU"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
index 212226ff..54aee5a7 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["sk-SK"]={formatLoadingMessage:function(){return"Prosím čakajte ..."},formatRecordsPerPage:function(a){return a+" záznamov na stranu"},formatShowingRows:function(a,b,c){return"Zobrazená "+a+". - "+b+". položka z celkových "+c},formatSearch:function(){return"Vyhľadávanie"},formatNoMatches:function(){return"Nenájdená žiadna vyhovujúca položka"},formatPaginationSwitch:function(){return"Skry/Zobraz stránkovanie"},formatRefresh:function(){return"Obnoviť"},formatToggle:function(){return"Prepni"},formatColumns:function(){return"Stĺpce"},formatAllRows:function(){return"Všetky"},formatExport:function(){return"Exportuj dáta"},formatClearFilters:function(){return"Odstráň filtre"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["sk-SK"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,a=Object.getOwnPropertyDescriptor,f={f:a&&!c.call({1:2},1)?function(t){var n=a(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return g(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},k=Object.defineProperty,A={f:u?k:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return k(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},E=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{E(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||M("__core-js_shared__",{}),z=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return z.call(t)});var C,R,N,F,I=_.inspectSource,L=o.WeakMap,D="function"==typeof L&&/native code/.test(I(L)),q=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,K=Math.random(),V=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+K).toString(36)},Z=q("keys"),B={},H=o.WeakMap;if(D){var W=new H,J=W.get,Q=W.has,U=W.set;C=function(t,n){return U.call(W,t,n),n},R=function(t){return J.call(W,t)||{}},N=function(t){return Q.call(W,t)}}else{var Y=Z[F="state"]||(Z[F]=V(F));B[Y]=!0,C=function(t,n){return E(t,Y,n),n},R=function(t){return w(t,Y)?t[Y]:{}},N=function(t){return w(t,Y)}}var X,$,tt={set:C,get:R,has:N,enforce:function(t){return N(t)?R(t):C(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,a=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||E(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!f&&t[n]&&(a=!0):delete t[n],a?t[n]=i:E(t,n,i)):a?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},at=Math.min,ft=function(t){return t>0?at(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ft(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},yt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(B,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~yt(i,r)||i.push(r));return i}(t,gt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=A.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,kt=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(d(t))},Et=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),zt=q("wks"),Ct=o.Symbol,Rt=_t?Ct:V,Nt=function(t){return w(zt,t)||(Mt&&w(Ct,t)?zt[t]=Ct[t]:zt[t]=Rt("Symbol."+t)),zt[t]},Ft=Nt("species"),It=function(t,n){var r;return kt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!kt(r.prototype)?m(r)&&null===(r=r[Ft])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Lt=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Gt=qt&&qt.v8;Gt?$=(X=Gt.split("."))[0]+X[1]:Lt&&(!(X=Lt.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Lt.match(/Chrome\/(\d+)/))&&($=X[1]);var Kt,Vt=$&&+$,Zt=Nt("species"),Bt=Nt("isConcatSpreadable"),Ht=Vt>=51||!i((function(){var t=[];return t[Bt]=!1,t.concat()[0]!==t})),Wt=(Kt="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Zt]=function(){return{foo:1}},1!==t[Kt](Boolean).foo}))),Jt=function(t){if(!m(t))return!1;var n=t[Bt];return void 0!==n?!!n:kt(t)};!function(t,n){var r,e,i,u,c,a=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[a]||M(a,{}):(o[a]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(f?e:a+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&E(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Ht||!Wt},{concat:function(t){var n,r,e,o,i,u=At(this),c=It(u,0),a=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Jt(i)){if(a+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,a++)r in i&&Et(c,a,i[r])}else{if(a>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Et(c,a++,i)}return c.length=a,c}}),t.fn.bootstrapTable.locales["sk-SK"]={formatLoadingMessage:function(){return"Prosím čakajte"},formatRecordsPerPage:function(t){return"".concat(t," záznamov na stranu")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Zobrazená ".concat(t,". - ").concat(n,". položka z celkových ").concat(r," (filtered from ").concat(e," total rows)"):"Zobrazená ".concat(t,". - ").concat(n,". položka z celkových ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Odstráň filtre"},formatSearch:function(){return"Vyhľadávanie"},formatNoMatches:function(){return"Nenájdená žiadna vyhovujúca položka"},formatPaginationSwitch:function(){return"Skry/Zobraz stránkovanie"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Obnoviť"},formatToggle:function(){return"Prepni"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Stĺpce"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Všetky"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Exportuj dáta"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sk-SK"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
new file mode 100644
index 00000000..48fcbfe7
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),u=function(t){try{return!!t()}catch(t){return!0}},i=!u((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),f={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,a={f:c&&!f.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:f},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,g=u((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,m=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return g(m(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,S=function(t,n){return b.call(t,n)},w=o.document,O=h(w)&&h(w.createElement),j=!i&&!u((function(){return 7!=Object.defineProperty((t="div",O?w.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:i?P:function(t,n){if(t=d(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(S(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:i?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=i?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,k,F,I,L=R.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},J=z("keys"),K={},Q=o.WeakMap;if(q){var U=new Q,V=U.get,Y=U.has,H=U.set;N=function(t,n){return H.call(U,t,n),n},k=function(t){return V.call(U,t)||{}},F=function(t){return Y.call(U,t)}}else{var X=J[I="state"]||(J[I]=W(I));K[X]=!0,N=function(t,n){return M(t,X,n),n},k=function(t){return S(t,X)?t[X]:{}},F=function(t){return S(t,X)}}var Z,$,tt={set:N,get:k,has:F,enforce:function(t){return F(t)?k(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=k(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,u,i){var f=!!i&&!!i.unsafe,c=!!i&&!!i.enumerable,a=!!i&&!!i.noTargetGet;"function"==typeof u&&("string"!=typeof n||S(u,"name")||M(u,"name",n),r(u).source=e.join("string"==typeof n?n:"")),t!==o?(f?!a&&t[n]&&(c=!0):delete t[n],c?t[n]=u:M(t,n,u)):c?t[n]=u:C(n,u)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},ut=Math.ceil,it=Math.floor,ft=function(t){return isNaN(t=+t)?0:(t>0?it:ut)(t)},ct=Math.min,at=function(t){return t>0?ct(ft(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,u=d(n),i=at(u.length),f=function(t,n){var r=ft(t);return r<0?lt(r+n,0):st(r,n)}(e,i);if(t&&r!=r){for(;i>f;)if((o=u[f++])!=o)return!0}else for(;i>f;f++)if((t||f in u)&&u[f]===r)return t||f||0;return!t&&-1}},yt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,u=[];for(r in e)!S(K,r)&&S(e,r)&&u.push(r);for(;n.length>o;)S(e,r=n[o++])&&(~yt(u,r)||u.push(r));return u}(t,gt)}},dt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=mt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=T.f,u=0;u<r.length;u++){var i=r[u];S(t,i)||e(t,i,o(n,i))}},bt=/#|\.prototype\./,St=function(t,n){var r=Ot[wt(t)];return r==Pt||r!=jt&&("function"==typeof n?u(n):!!n)},wt=St.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=St.data={},jt=St.NATIVE="N",Pt=St.POLYFILL="P",Tt=St,xt=T.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(m(t))},Mt=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!u((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=z("wks"),Nt=o.Symbol,kt=Rt?Nt:W,Ft=function(t){return S(_t,t)||(Ct&&S(Nt,t)?_t[t]=Nt[t]:_t[t]=kt("Symbol."+t)),_t[t]},It=Ft("species"),Lt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Bt=zt&&zt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Wt=$&&+$,Jt=Ft("species"),Kt=Ft("isConcatSpreadable"),Qt=Wt>=51||!u((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Ut=(Gt="concat",Wt>=51||!u((function(){var t=[];return(t.constructor={})[Jt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Vt=function(t){if(!h(t))return!1;var n=t[Kt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,u,i,f,c=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(i=n[e],u=t.noTargetGet?(f=xt(r,e))&&f.value:r[e],!Tt(a?e:c+(l?".":"#")+e,t.forced)&&void 0!==u){if(typeof i==typeof u)continue;vt(i,u)}(t.sham||u&&u.sham)&&M(i,"sham",!0),nt(r,e,i,t)}}({target:"Array",proto:!0,forced:!Qt||!Ut},{concat:function(t){var n,r,e,o,u,i=At(this),f=Lt(i,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(u=-1===n?i:arguments[n],Vt(u)){if(c+(o=at(u.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in u&&Mt(f,c,u[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(f,c++,u)}return f.length=c,f}}),t.fn.bootstrapTable.locales["sr-Cyrl-RS"]={formatLoadingMessage:function(){return"Молим сачекај"},formatRecordsPerPage:function(t){return"".concat(t," редова по страни")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Приказано ".concat(t,". - ").concat(n,". од укупног броја редова ").concat(r," (филтрирано од ").concat(e,")"):"Приказано ".concat(t,". - ").concat(n,". од укупног броја редова ").concat(r)},formatSRPaginationPreText:function(){return"претходна страна"},formatSRPaginationPageText:function(t){return"на страну ".concat(t)},formatSRPaginationNextText:function(){return"следећа страна"},formatDetailPagination:function(t){return"Приказано ".concat(t," редова")},formatClearSearch:function(){return"Обриши претрагу"},formatSearch:function(){return"Пронађи"},formatNoMatches:function(){return"Није пронађен ни један податак"},formatPaginationSwitch:function(){return"Прикажи/сакриј пагинацију"},formatPaginationSwitchDown:function(){return"Прикажи пагинацију"},formatPaginationSwitchUp:function(){return"Сакриј пагинацију"},formatRefresh:function(){return"Освежи"},formatToggle:function(){return"Промени приказ"},formatToggleOn:function(){return"Прикажи картице"},formatToggleOff:function(){return"Сакриј картице"},formatColumns:function(){return"Колоне"},formatColumnsToggleAll:function(){return"Прикажи/сакриј све"},formatFullscreen:function(){return"Цео екран"},formatAllRows:function(){return"Све"},formatAutoRefresh:function(){return"Аутоматско освежавање"},formatExport:function(){return"Извези податке"},formatJumpTo:function(){return"Иди"},formatAdvancedSearch:function(){return"Напредна претрага"},formatAdvancedCloseButton:function(){return"Затвори"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sr-Cyrl-RS"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
new file mode 100644
index 00000000..7b3fe8d3
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),u={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!u.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:u},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},d="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return g(y(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,S=function(t,n){return b.call(t,n)},j=o.document,w=h(j)&&h(j.createElement),P=!a&&!i((function(){return 7!=Object.defineProperty((t="div",w?j.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),O=Object.getOwnPropertyDescriptor,k={f:a?O:function(t,n){if(t=m(t),n=v(n,!0),P)try{return O(t,n)}catch(t){}if(S(t,n))return l(!f.f.call(t,n),t[n])}},T=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},x=Object.defineProperty,A={f:a?x:function(t,n,r){if(T(t),n=v(n,!0),T(r),P)try{return x(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},E=a?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},M=function(t,n){try{E(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||M("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var C,z,N,I,L=R.inspectSource,F=o.WeakMap,D="function"==typeof F&&/native code/.test(L(F)),q=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),K=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},W=q("keys"),J={},Q=o.WeakMap;if(D){var U=new Q,V=U.get,Y=U.has,Z=U.set;C=function(t,n){return Z.call(U,t,n),n},z=function(t){return V.call(U,t)||{}},N=function(t){return Y.call(U,t)}}else{var H=W[I="state"]||(W[I]=K(I));J[H]=!0,C=function(t,n){return E(t,H,n),n},z=function(t){return S(t,H)?t[H]:{}},N=function(t){return S(t,H)}}var X,$,tt={set:C,get:z,has:N,enforce:function(t){return N(t)?z(t):C(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=z(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,a){var u=!!a&&!!a.unsafe,c=!!a&&!!a.enumerable,f=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof n||S(i,"name")||E(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(u?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:E(t,n,i)):c?t[n]=i:M(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,at=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?at:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(ut(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=m(n),a=ft(i.length),u=function(t,n){var r=ut(t);return r<0?lt(r+n,0):st(r,n)}(e,a);if(t&&r!=r){for(;a>u;)if((o=i[u++])!=o)return!0}else for(;a>u;u++)if((t||u in i)&&i[u]===r)return t||u||0;return!t&&-1}},dt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=m(t),o=0,i=[];for(r in e)!S(J,r)&&S(e,r)&&i.push(r);for(;n.length>o;)S(e,r=n[o++])&&(~dt(i,r)||i.push(r));return i}(t,gt)}},mt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=yt.f(T(t)),r=mt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=k.f,i=0;i<r.length;i++){var a=r[i];S(t,a)||e(t,a,o(n,a))}},bt=/#|\.prototype\./,St=function(t,n){var r=wt[jt(t)];return r==Ot||r!=Pt&&("function"==typeof n?i(n):!!n)},jt=St.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},wt=St.data={},Pt=St.NATIVE="N",Ot=St.POLYFILL="P",kt=St,Tt=k.f,xt=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(y(t))},Et=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Mt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Mt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=q("wks"),Ct=o.Symbol,zt=Rt?Ct:K,Nt=function(t){return S(_t,t)||(Mt&&S(Ct,t)?_t[t]=Ct[t]:_t[t]=zt("Symbol."+t)),_t[t]},It=Nt("species"),Lt=function(t,n){var r;return xt(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!xt(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Ft=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Bt=qt&&qt.v8;Bt?$=(X=Bt.split("."))[0]+X[1]:Ft&&(!(X=Ft.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=Ft.match(/Chrome\/(\d+)/))&&($=X[1]);var Gt,Kt=$&&+$,Wt=Nt("species"),Jt=Nt("isConcatSpreadable"),Qt=Kt>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Ut=(Gt="concat",Kt>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Vt=function(t){if(!h(t))return!1;var n=t[Jt];return void 0!==n?!!n:xt(t)};!function(t,n){var r,e,i,a,u,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||M(c,{}):(o[c]||{}).prototype)for(e in n){if(a=n[e],i=t.noTargetGet?(u=Tt(r,e))&&u.value:r[e],!kt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;vt(a,i)}(t.sham||i&&i.sham)&&E(a,"sham",!0),nt(r,e,a,t)}}({target:"Array",proto:!0,forced:!Qt||!Ut},{concat:function(t){var n,r,e,o,i,a=At(this),u=Lt(a,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?a:arguments[n],Vt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Et(u,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Et(u,c++,i)}return u.length=c,u}}),t.fn.bootstrapTable.locales["sr-Latn-RS"]={formatLoadingMessage:function(){return"Molim sačekaj"},formatRecordsPerPage:function(t){return"".concat(t," redova po strani")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Prikazano ".concat(t,". - ").concat(n,". od ukupnog broja redova ").concat(r," (filtrirano od ").concat(e,")"):"Prikazano ".concat(t,". - ").concat(n,". od ukupnog broja redova ").concat(r)},formatSRPaginationPreText:function(){return"prethodna strana"},formatSRPaginationPageText:function(t){return"na stranu ".concat(t)},formatSRPaginationNextText:function(){return"sledeća strana"},formatDetailPagination:function(t){return"Prikazano ".concat(t," redova")},formatClearSearch:function(){return"Obriši pretragu"},formatSearch:function(){return"Pronađi"},formatNoMatches:function(){return"Nije pronađen ni jedan podatak"},formatPaginationSwitch:function(){return"Prikaži/sakrij paginaciju"},formatPaginationSwitchDown:function(){return"Prikaži paginaciju"},formatPaginationSwitchUp:function(){return"Sakrij paginaciju"},formatRefresh:function(){return"Osveži"},formatToggle:function(){return"Promeni prikaz"},formatToggleOn:function(){return"Prikaži kartice"},formatToggleOff:function(){return"Sakrij kartice"},formatColumns:function(){return"Kolone"},formatColumnsToggleAll:function(){return"Prikaži/sakrij sve"},formatFullscreen:function(){return"Ceo ekran"},formatAllRows:function(){return"Sve"},formatAutoRefresh:function(){return"Automatsko osvežavanje"},formatExport:function(){return"Izvezi podatke"},formatJumpTo:function(){return"Idi"},formatAdvancedSearch:function(){return"Napredna pretraga"},formatAdvancedCloseButton:function(){return"Zatvori"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sr-Latn-RS"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
index c7776618..e5fb42b8 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["sv-SE"]={formatLoadingMessage:function(){return"Laddar, vänligen vänta..."},formatRecordsPerPage:function(a){return a+" rader per sida"},formatShowingRows:function(a,b,c){return"Visa "+a+" till "+b+" av "+c+" rader"},formatSearch:function(){return"Sök"},formatNoMatches:function(){return"Inga matchande resultat funna."},formatRefresh:function(){return"Uppdatera"},formatToggle:function(){return"Skifta"},formatColumns:function(){return"kolumn"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["sv-SE"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},d="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return g(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,S=function(t,n){return b.call(t,n)},w=o.document,O=m(w)&&m(w.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?w.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(S(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:u?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var k,F,I,L,N=_.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(N(D)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),V=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),U={},W=o.WeakMap;if(q){var J=new W,K=J.get,Q=J.has,Y=J.set;k=function(t,n){return Y.call(J,t,n),n},F=function(t){return K.call(J,t)||{}},I=function(t){return Q.call(J,t)}}else{var X=B[L="state"]||(B[L]=V(L));U[X]=!0,k=function(t,n){return M(t,X,n),n},F=function(t){return S(t,X)?t[X]:{}},I=function(t){return S(t,X)}}var Z,$,tt={set:k,get:F,has:I,enforce:function(t){return I(t)?F(t):k(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||S(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||N(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},dt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!S(U,r)&&S(e,r)&&i.push(r);for(;n.length>o;)S(e,r=n[o++])&&(~dt(i,r)||i.push(r));return i}(t,gt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=A.f,o=T.f,i=0;i<r.length;i++){var u=r[i];S(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,St=function(t,n){var r=Ot[wt(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},wt=St.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=St.data={},jt=St.NATIVE="N",Pt=St.POLYFILL="P",Tt=St,xt=T.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),kt=o.Symbol,Ft=_t?kt:V,It=function(t){return S(Rt,t)||(Ct&&S(kt,t)?Rt[t]=kt[t]:Rt[t]=Ft("Symbol."+t)),Rt[t]},Lt=It("species"),Nt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?m(r)&&null===(r=r[Lt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Vt=$&&+$,Bt=It("species"),Ut=It("isConcatSpreadable"),Wt=Vt>=51||!i((function(){var t=[];return t[Ut]=!1,t.concat()[0]!==t})),Jt=(Ht="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Kt=function(t){if(!m(t))return!1;var n=t[Ut];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Tt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,r,e,o,i,u=At(this),a=Nt(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Kt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["sv-SE"]={formatLoadingMessage:function(){return"Laddar, vänligen vänta"},formatRecordsPerPage:function(t){return"".concat(t," rader per sida")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Visa ".concat(t," till ").concat(n," av ").concat(r," rader (filtered from ").concat(e," total rows)"):"Visa ".concat(t," till ").concat(n," av ").concat(r," rader")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Sök"},formatNoMatches:function(){return"Inga matchande resultat funna."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Uppdatera"},formatToggle:function(){return"Skifta"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"kolumn"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sv-SE"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
index e575bfdf..b6390a2c 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["th-TH"]={formatLoadingMessage:function(){return"กำลังโหลดข้อมูล, กรุณารอสักครู่..."},formatRecordsPerPage:function(a){return a+" รายการต่อหน้า"},formatShowingRows:function(a,b,c){return"รายการที่ "+a+" ถึง "+b+" จากทั้งหมด "+c+" รายการ"},formatSearch:function(){return"ค้นหา"},formatNoMatches:function(){return"ไม่พบรายการที่ค้นหา !"},formatRefresh:function(){return"รีเฟรส"},formatToggle:function(){return"สลับมุมมอง"},formatColumns:function(){return"คอลัมน์"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["th-TH"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=h(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var F,N,k,I,L=_.inspectSource,D=o.WeakMap,H="function"==typeof D&&/native code/.test(L(D)),q=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,G=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+G).toString(36)},W=q("keys"),J={},K=o.WeakMap;if(H){var Q=new K,U=Q.get,V=Q.has,Y=Q.set;F=function(t,n){return Y.call(Q,t,n),n},N=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=W[I="state"]||(W[I]=B(I));J[X]=!0,F=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(J,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=q("wks"),Ft=o.Symbol,Nt=_t?Ft:B,kt=function(t){return w(Rt,t)||(Ct&&w(Ft,t)?Rt[t]=Ft[t]:Rt[t]=Nt("Symbol."+t)),Rt[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",Ht=o.process,qt=Ht&&Ht.versions,zt=qt&&qt.v8;zt?$=(Z=zt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Bt=$&&+$,Wt=kt("species"),Jt=kt("isConcatSpreadable"),Kt=Bt>=51||!i((function(){var t=[];return t[Jt]=!1,t.concat()[0]!==t})),Qt=(Gt="concat",Bt>=51||!i((function(){var t=[];return(t.constructor={})[Wt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Jt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Pt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Kt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["th-TH"]={formatLoadingMessage:function(){return"กำลังโหลดข้อมูล, กรุณารอสักครู่"},formatRecordsPerPage:function(t){return"".concat(t," รายการต่อหน้า")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"รายการที่ ".concat(t," ถึง ").concat(n," จากทั้งหมด ").concat(r," รายการ (filtered from ").concat(e," total rows)"):"รายการที่ ".concat(t," ถึง ").concat(n," จากทั้งหมด ").concat(r," รายการ")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"ค้นหา"},formatNoMatches:function(){return"ไม่พบรายการที่ค้นหา !"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"รีเฟรส"},formatToggle:function(){return"สลับมุมมอง"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"คอลัมน์"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["th-TH"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
index 9a6aa9ba..b2cccef6 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["tr-TR"]={formatLoadingMessage:function(){return"Yükleniyor, lütfen bekleyin..."},formatRecordsPerPage:function(a){return"Sayfa başına "+a+" kayıt."},formatShowingRows:function(a,b,c){return c+" kayıttan "+a+"-"+b+" arası gösteriliyor."},formatSearch:function(){return"Ara"},formatNoMatches:function(){return"Eşleşen kayıt bulunamadı."},formatRefresh:function(){return"Yenile"},formatToggle:function(){return"Değiştir"},formatColumns:function(){return"Sütunlar"},formatAllRows:function(){return"Tüm Satırlar"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["tr-TR"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),a={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!a.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:a},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return g(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=h(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},k=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||k("__core-js_shared__",{}),C=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return C.call(t)});var _,F,N,D,I=R.inspectSource,L=o.WeakMap,q="function"==typeof L&&/native code/.test(I(L)),z=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),Y=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),W={},J=o.WeakMap;if(q){var K=new J,Q=K.get,U=K.has,V=K.set;_=function(t,n){return V.call(K,t,n),n},F=function(t){return Q.call(K,t)||{}},N=function(t){return U.call(K,t)}}else{var X=B[D="state"]||(B[D]=Y(D));W[X]=!0,_=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},N=function(t){return w(t,X)}}var Z,$,tt={set:_,get:F,has:N,enforce:function(t){return N(t)?F(t):_(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var a=!!u&&!!u.unsafe,c=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(a?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||I(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(at(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=ft(i.length),a=function(t,n){var r=at(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>a;)if((o=i[a++])!=o)return!0}else for(;u>a;a++)if((t||a in i)&&i[a]===r)return t||a||0;return!t&&-1}},yt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~yt(i,r)||i.push(r));return i}(t,gt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},kt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=kt&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=z("wks"),_t=o.Symbol,Ft=Rt?_t:Y,Nt=function(t){return w(Ct,t)||(kt&&w(_t,t)?Ct[t]=_t[t]:Ct[t]=Ft("Symbol."+t)),Ct[t]},Dt=Nt("species"),It=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[Dt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Lt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Lt&&(!(Z=Lt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Lt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Yt=$&&+$,Bt=Nt("species"),Wt=Nt("isConcatSpreadable"),Jt=Yt>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Kt=(Ht="concat",Yt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,a,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||k(c,{}):(o[c]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(a=xt(r,e))&&a.value:r[e],!Pt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=Et(this),a=It(u,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(a,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(a,c++,i)}return a.length=c,a}}),t.fn.bootstrapTable.locales["tr-TR"]={formatLoadingMessage:function(){return"Yükleniyor, lütfen bekleyin"},formatRecordsPerPage:function(t){return"Sayfa başına ".concat(t," kayıt.")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"".concat(r," kayıttan ").concat(t,"-").concat(n," arası gösteriliyor (filtered from ").concat(e," total rows)."):"".concat(r," kayıttan ").concat(t,"-").concat(n," arası gösteriliyor.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Ara"},formatNoMatches:function(){return"Eşleşen kayıt bulunamadı."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Yenile"},formatToggle:function(){return"Değiştir"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Sütunlar"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Tüm Satırlar"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["tr-TR"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
index 72451d35..533779af 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["uk-UA"]={formatLoadingMessage:function(){return"Завантаження, будь ласка, зачекайте..."},formatRecordsPerPage:function(a){return a+" записів на сторінку"},formatShowingRows:function(a,b,c){return"Показано з "+a+" по "+b+". Всього: "+c},formatSearch:function(){return"Пошук"},formatNoMatches:function(){return"Не знайдено жодного запису"},formatRefresh:function(){return"Оновити"},formatToggle:function(){return"Змінити"},formatColumns:function(){return"Стовпці"},formatClearFilters:function(){return"Очистити фільтри"},formatMultipleSort:function(){return"Сортування за кількома стовпцями"},formatAddLevel:function(){return"Додати рівень"},formatDeleteLevel:function(){return"Видалити рівень"},formatColumn:function(){return"Стовпець"},formatOrder:function(){return"Порядок"},formatSortBy:function(){return"Сортувати за"},formatThenBy:function(){return"потім за"},formatSort:function(){return"Сортувати"},formatCancel:function(){return"Скасувати"},formatDuplicateAlertTitle:function(){return"Дублювання стовпців!"},formatDuplicateAlertDescription:function(){return"Видаліть, будь ласка, дублюючий стовпець, або замініть його на інший."}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["uk-UA"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:u?P:function(t,n){if(t=h(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},_=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||_("__core-js_shared__",{}),R=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return R.call(t)});var k,F,N,I,L=C.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),W={},J=o.WeakMap;if(q){var K=new J,Q=K.get,V=K.has,Y=K.set;k=function(t,n){return Y.call(K,t,n),n},F=function(t){return Q.call(K,t)||{}},N=function(t){return V.call(K,t)}}else{var X=B[I="state"]||(B[I]=U(I));W[X]=!0,k=function(t,n){return M(t,X,n),n},F=function(t){return w(t,X)?t[X]:{}},N=function(t){return w(t,X)}}var Z,$,tt={set:k,get:F,has:N,enforce:function(t){return N(t)?F(t):k(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:_(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},_t=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=_t&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),kt=o.Symbol,Ft=Ct?kt:U,Nt=function(t){return w(Rt,t)||(_t&&w(kt,t)?Rt[t]=kt[t]:Rt[t]=Ft("Symbol."+t)),Rt[t]},It=Nt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Ut=$&&+$,Bt=Nt("species"),Wt=Nt("isConcatSpreadable"),Jt=Ut>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Kt=(Ht="concat",Ut>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||_(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Kt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["uk-UA"]={formatLoadingMessage:function(){return"Завантаження, будь ласка, зачекайте"},formatRecordsPerPage:function(t){return"".concat(t," записів на сторінку")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Показано з ".concat(t," по ").concat(n,". Всього: ").concat(r," (filtered from ").concat(e," total rows)"):"Показано з ".concat(t," по ").concat(n,". Всього: ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Очистити фільтри"},formatSearch:function(){return"Пошук"},formatNoMatches:function(){return"Не знайдено жодного запису"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Оновити"},formatToggle:function(){return"Змінити"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Стовпці"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["uk-UA"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
index 78666772..8f4a48f4 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["ur-PK"]={formatLoadingMessage:function(){return"براۓ مہربانی انتظار کیجئے"},formatRecordsPerPage:function(a){return a+" ریکارڈز فی صفہ "},formatShowingRows:function(a,b,c){return"دیکھیں "+a+" سے "+b+" کے "+c+"ریکارڈز"},formatSearch:function(){return"تلاش"},formatNoMatches:function(){return"کوئی ریکارڈ نہیں ملا"},formatRefresh:function(){return"تازہ کریں"},formatToggle:function(){return"تبدیل کریں"},formatColumns:function(){return"کالم"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["ur-PK"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},h=function(t){return y(d(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),P=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,T={f:u?j:function(t,n){if(t=h(t),n=v(n,!0),P)try{return j(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),P)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),R=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return R.call(t)});var F,N,k,I,L=_.inspectSource,D=o.WeakMap,q="function"==typeof D&&/native code/.test(L(D)),z=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,H=Math.random(),K=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+H).toString(36)},B=z("keys"),W={},J=o.WeakMap;if(q){var Q=new J,U=Q.get,V=Q.has,Y=Q.set;F=function(t,n){return Y.call(Q,t,n),n},N=function(t){return U.call(Q,t)||{}},k=function(t){return V.call(Q,t)}}else{var X=B[I="state"]||(B[I]=K(I));W[X]=!0,F=function(t,n){return M(t,X,n),n},N=function(t){return w(t,X)?t[X]:{}},k=function(t){return w(t,X)}}var Z,$,tt={set:F,get:N,has:k,enforce:function(t){return k(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=h(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),dt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=h(t),o=0,i=[];for(r in e)!w(W,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,yt)}},ht={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=dt.f(x(t)),r=ht.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Pt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Pt=wt.NATIVE="N",jt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(d(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=z("wks"),Ft=o.Symbol,Nt=_t?Ft:K,kt=function(t){return w(Rt,t)||(Ct&&w(Ft,t)?Rt[t]=Ft[t]:Rt[t]=Nt("Symbol."+t)),Rt[t]},It=kt("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",qt=o.process,zt=qt&&qt.versions,Gt=zt&&zt.v8;Gt?$=(Z=Gt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Ht,Kt=$&&+$,Bt=kt("species"),Wt=kt("isConcatSpreadable"),Jt=Kt>=51||!i((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Qt=(Ht="concat",Kt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Ht](Boolean).foo}))),Ut=function(t){if(!m(t))return!1;var n=t[Wt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Tt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Jt||!Qt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Ut(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["ur-PK"]={formatLoadingMessage:function(){return"براۓ مہربانی انتظار کیجئے"},formatRecordsPerPage:function(t){return"".concat(t," ریکارڈز فی صفہ ")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"دیکھیں ".concat(t," سے ").concat(n," کے ").concat(r,"ریکارڈز (filtered from ").concat(e," total rows)"):"دیکھیں ".concat(t," سے ").concat(n," کے ").concat(r,"ریکارڈز")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"تلاش"},formatNoMatches:function(){return"کوئی ریکارڈ نہیں ملا"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"تازہ کریں"},formatToggle:function(){return"تبدیل کریں"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"کالم"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ur-PK"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
index 9713f338..11c5239e 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["uz-Latn-UZ"]={formatLoadingMessage:function(){return"Yuklanyapti, iltimos kuting..."},formatRecordsPerPage:function(a){return a+" qator har sahifada"},formatShowingRows:function(a,b,c){return"Ko'rsatypati "+a+" dan "+b+" gacha "+c+" qatorlarni"},formatSearch:function(){return"Qidirish"},formatNoMatches:function(){return"Hech narsa topilmadi"},formatPaginationSwitch:function(){return"Sahifalashni yashirish/ko'rsatish"},formatRefresh:function(){return"Yangilash"},formatToggle:function(){return"Ko'rinish"},formatColumns:function(){return"Ustunlar"},formatAllRows:function(){return"Hammasi"},formatExport:function(){return"Eksport"},formatClearFilters:function(){return"Filtrlarni tozalash"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["uz-Latn-UZ"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),u={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,f={f:c&&!u.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:u},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return h(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),j=!a&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:a?P:function(t,n){if(t=d(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!f.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:a?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=a?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},_=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},k=o["__core-js_shared__"]||_("__core-js_shared__",{}),C=Function.toString;"function"!=typeof k.inspectSource&&(k.inspectSource=function(t){return C.call(t)});var R,F,L,q,N=k.inspectSource,z=o.WeakMap,I="function"==typeof z&&/native code/.test(N(z)),D=r((function(t){(t.exports=function(t,n){return k[t]||(k[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),H=0,K=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++H+K).toString(36)},G=D("keys"),Y={},B=o.WeakMap;if(I){var Q=new B,W=Q.get,Z=Q.has,J=Q.set;R=function(t,n){return J.call(Q,t,n),n},F=function(t){return W.call(Q,t)||{}},L=function(t){return Z.call(Q,t)}}else{var V=G[q="state"]||(G[q]=U(q));Y[V]=!0,R=function(t,n){return M(t,V,n),n},F=function(t){return w(t,V)?t[V]:{}},L=function(t){return w(t,V)}}var X,$,tt={set:R,get:F,has:L,enforce:function(t){return L(t)?F(t):R(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,a){var u=!!a&&!!a.unsafe,c=!!a&&!!a.enumerable,f=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(u?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=i:M(t,n,i)):c?t[n]=i:_(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||N(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,at=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?at:it)(t)},ct=Math.min,ft=function(t){return t>0?ct(ut(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=d(n),a=ft(i.length),u=function(t,n){var r=ut(t);return r<0?lt(r+n,0):st(r,n)}(e,a);if(t&&r!=r){for(;a>u;)if((o=i[u++])!=o)return!0}else for(;a>u;u++)if((t||u in i)&&i[u]===r)return t||u||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,ht=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,i=[];for(r in e)!w(Y,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,ht)}},dt={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=T.f,i=0;i<r.length;i++){var a=r[i];w(t,a)||e(t,a,o(n,a))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},_t=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),kt=_t&&!Symbol.sham&&"symbol"==typeof Symbol(),Ct=D("wks"),Rt=o.Symbol,Ft=kt?Rt:U,Lt=function(t){return w(Ct,t)||(_t&&w(Rt,t)?Ct[t]=Rt[t]:Ct[t]=Ft("Symbol."+t)),Ct[t]},qt=Lt("species"),Nt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[qt])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},zt=ot("navigator","userAgent")||"",It=o.process,Dt=It&&It.versions,Ht=Dt&&Dt.v8;Ht?$=(X=Ht.split("."))[0]+X[1]:zt&&(!(X=zt.match(/Edge\/(\d+)/))||X[1]>=74)&&(X=zt.match(/Chrome\/(\d+)/))&&($=X[1]);var Kt,Ut=$&&+$,Gt=Lt("species"),Yt=Lt("isConcatSpreadable"),Bt=Ut>=51||!i((function(){var t=[];return t[Yt]=!1,t.concat()[0]!==t})),Qt=(Kt="concat",Ut>=51||!i((function(){var t=[];return(t.constructor={})[Gt]=function(){return{foo:1}},1!==t[Kt](Boolean).foo}))),Wt=function(t){if(!m(t))return!1;var n=t[Yt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,a,u,c=t.target,f=t.global,l=t.stat;if(r=f?o:l?o[c]||_(c,{}):(o[c]||{}).prototype)for(e in n){if(a=n[e],i=t.noTargetGet?(u=xt(r,e))&&u.value:r[e],!Tt(f?e:c+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;vt(a,i)}(t.sham||i&&i.sham)&&M(a,"sham",!0),nt(r,e,a,t)}}({target:"Array",proto:!0,forced:!Bt||!Qt},{concat:function(t){var n,r,e,o,i,a=Et(this),u=Nt(a,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?a:arguments[n],Wt(i)){if(c+(o=ft(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in i&&Mt(u,c,i[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(u,c++,i)}return u.length=c,u}}),t.fn.bootstrapTable.locales["uz-Latn-UZ"]={formatLoadingMessage:function(){return"Yuklanyapti, iltimos kuting"},formatRecordsPerPage:function(t){return"".concat(t," qator har sahifada")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Ko'rsatypati ".concat(t," dan ").concat(n," gacha ").concat(r," qatorlarni (filtered from ").concat(e," total rows)"):"Ko'rsatypati ".concat(t," dan ").concat(n," gacha ").concat(r," qatorlarni")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Filtrlarni tozalash"},formatSearch:function(){return"Qidirish"},formatNoMatches:function(){return"Hech narsa topilmadi"},formatPaginationSwitch:function(){return"Sahifalashni yashirish/ko'rsatish"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Yangilash"},formatToggle:function(){return"Ko'rinish"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Ustunlar"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Hammasi"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Eksport"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["uz-Latn-UZ"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
index 000b0bbf..31974b8d 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["vi-VN"]={formatLoadingMessage:function(){return"Đang tải..."},formatRecordsPerPage:function(a){return a+" bản ghi mỗi trang"},formatShowingRows:function(a,b,c){return"Hiển thị từ trang "+a+" đến "+b+" của "+c+" bảng ghi"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["vi-VN"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},g="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return h(y(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!m(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!m(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!m(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=m(S)&&m(S.createElement),T=!u&&!i((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:u?j:function(t,n){if(t=d(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,E={f:u?A:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return A(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=u?function(t,n,r){return E.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},R=o["__core-js_shared__"]||C("__core-js_shared__",{}),_=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return _.call(t)});var N,k,F,I,L=R.inspectSource,D=o.WeakMap,H="function"==typeof D&&/native code/.test(L(D)),q=r((function(t){(t.exports=function(t,n){return R[t]||(R[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,G=Math.random(),V=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+G).toString(36)},B=q("keys"),K={},W=o.WeakMap;if(H){var J=new W,Q=J.get,U=J.has,Y=J.set;N=function(t,n){return Y.call(J,t,n),n},k=function(t){return Q.call(J,t)||{}},F=function(t){return U.call(J,t)}}else{var X=B[I="state"]||(B[I]=V(I));K[X]=!0,N=function(t,n){return M(t,X,n),n},k=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:N,get:k,has:F,enforce:function(t){return F(t)?k(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!m(n)||(r=k(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),r(i).source=e.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:C(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ut=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?ut:it)(t)},ft=Math.min,at=function(t){return t>0?ft(ct(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,i=d(n),u=at(i.length),c=function(t,n){var r=ct(t);return r<0?lt(r+n,0):st(r,n)}(e,u);if(t&&r!=r){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===r)return t||c||0;return!t&&-1}},gt={includes:pt(!0),indexOf:pt(!1)}.indexOf,ht=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,i=[];for(r in e)!w(K,r)&&w(e,r)&&i.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~gt(i,r)||i.push(r));return i}(t,ht)}},dt={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var n=yt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=mt(n),e=E.f,o=P.f,i=0;i<r.length;i++){var u=r[i];w(t,u)||e(t,u,o(n,u))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?i(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,At=Array.isArray||function(t){return"Array"==p(t)},Et=function(t){return Object(y(t))},Mt=function(t,n,r){var e=v(n);e in t?E.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=q("wks"),Nt=o.Symbol,kt=Rt?Nt:V,Ft=function(t){return w(_t,t)||(Ct&&w(Nt,t)?_t[t]=Nt[t]:_t[t]=kt("Symbol."+t)),_t[t]},It=Ft("species"),Lt=function(t,n){var r;return At(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!At(r.prototype)?m(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},Dt=ot("navigator","userAgent")||"",Ht=o.process,qt=Ht&&Ht.versions,zt=qt&&qt.v8;zt?$=(Z=zt.split("."))[0]+Z[1]:Dt&&(!(Z=Dt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Dt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Vt=$&&+$,Bt=Ft("species"),Kt=Ft("isConcatSpreadable"),Wt=Vt>=51||!i((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Jt=(Gt="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Bt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Qt=function(t){if(!m(t))return!1;var n=t[Kt];return void 0!==n?!!n:At(t)};!function(t,n){var r,e,i,u,c,f=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[f]||C(f,{}):(o[f]||{}).prototype)for(e in n){if(u=n[e],i=t.noTargetGet?(c=xt(r,e))&&c.value:r[e],!Pt(a?e:f+(l?".":"#")+e,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;vt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),nt(r,e,u,t)}}({target:"Array",proto:!0,forced:!Wt||!Jt},{concat:function(t){var n,r,e,o,i,u=Et(this),c=Lt(u,0),f=0;for(n=-1,e=arguments.length;n<e;n++)if(i=-1===n?u:arguments[n],Qt(i)){if(f+(o=at(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,f++)r in i&&Mt(c,f,i[r])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(c,f++,i)}return c.length=f,c}}),t.fn.bootstrapTable.locales["vi-VN"]={formatLoadingMessage:function(){return"Đang tải"},formatRecordsPerPage:function(t){return"".concat(t," bản ghi mỗi trang")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"Hiển thị từ trang ".concat(t," đến ").concat(n," của ").concat(r," bảng ghi (filtered from ").concat(e," total rows)"):"Hiển thị từ trang ".concat(t," đến ").concat(n," của ").concat(r," bảng ghi")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["vi-VN"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
index 81e27db8..57b3cdd6 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["zh-CN"]={formatLoadingMessage:function(){return"正在努力地加载数据中，请稍候……"},formatRecordsPerPage:function(a){return"每页显示 "+a+" 条记录"},formatShowingRows:function(a,b,c){return"显示第 "+a+" 到第 "+b+" 条记录，总共 "+c+" 条记录"},formatSearch:function(){return"搜索"},formatNoMatches:function(){return"没有找到匹配的记录"},formatPaginationSwitch:function(){return"隐藏/显示分页"},formatRefresh:function(){return"刷新"},formatToggle:function(){return"切换"},formatColumns:function(){return"列"},formatExport:function(){return"导出数据"},formatClearFilters:function(){return"清空过滤"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["zh-CN"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),u=function(t){try{return!!t()}catch(t){return!0}},i=!u((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),f={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,a={f:c&&!f.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:f},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,g=u((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,m=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return g(m(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),j=!i&&!u((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),P=Object.getOwnPropertyDescriptor,T={f:i?P:function(t,n){if(t=d(t),n=v(n,!0),j)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:i?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),j)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=i?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},C=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},_=o["__core-js_shared__"]||C("__core-js_shared__",{}),N=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return N.call(t)});var R,k,F,I,L=_.inspectSource,z=o.WeakMap,D="function"==typeof z&&/native code/.test(L(z)),q=r((function(t){(t.exports=function(t,n){return _[t]||(_[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),B=0,G=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+G).toString(36)},J=q("keys"),K={},Q=o.WeakMap;if(D){var U=new Q,V=U.get,Y=U.has,H=U.set;R=function(t,n){return H.call(U,t,n),n},k=function(t){return V.call(U,t)||{}},F=function(t){return Y.call(U,t)}}else{var X=J[I="state"]||(J[I]=W(I));K[X]=!0,R=function(t,n){return M(t,X,n),n},k=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:R,get:k,has:F,enforce:function(t){return F(t)?k(t):R(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=k(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,u,i){var f=!!i&&!!i.unsafe,c=!!i&&!!i.enumerable,a=!!i&&!!i.noTargetGet;"function"==typeof u&&("string"!=typeof n||w(u,"name")||M(u,"name",n),r(u).source=e.join("string"==typeof n?n:"")),t!==o?(f?!a&&t[n]&&(c=!0):delete t[n],c?t[n]=u:M(t,n,u)):c?t[n]=u:C(n,u)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},ut=Math.ceil,it=Math.floor,ft=function(t){return isNaN(t=+t)?0:(t>0?it:ut)(t)},ct=Math.min,at=function(t){return t>0?ct(ft(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,u=d(n),i=at(u.length),f=function(t,n){var r=ft(t);return r<0?lt(r+n,0):st(r,n)}(e,i);if(t&&r!=r){for(;i>f;)if((o=u[f++])!=o)return!0}else for(;i>f;f++)if((t||f in u)&&u[f]===r)return t||f||0;return!t&&-1}},yt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,u=[];for(r in e)!w(K,r)&&w(e,r)&&u.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~yt(u,r)||u.push(r));return u}(t,gt)}},dt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=mt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=T.f,u=0;u<r.length;u++){var i=r[u];w(t,i)||e(t,i,o(n,i))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==Pt||r!=jt&&("function"==typeof n?u(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},jt=wt.NATIVE="N",Pt=wt.POLYFILL="P",Tt=wt,xt=T.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(m(t))},Mt=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},Ct=!!Object.getOwnPropertySymbols&&!u((function(){return!String(Symbol())})),_t=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Nt=q("wks"),Rt=o.Symbol,kt=_t?Rt:W,Ft=function(t){return w(Nt,t)||(Ct&&w(Rt,t)?Nt[t]=Rt[t]:Nt[t]=kt("Symbol."+t)),Nt[t]},It=Ft("species"),Lt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},zt=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Bt=qt&&qt.v8;Bt?$=(Z=Bt.split("."))[0]+Z[1]:zt&&(!(Z=zt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=zt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Gt,Wt=$&&+$,Jt=Ft("species"),Kt=Ft("isConcatSpreadable"),Qt=Wt>=51||!u((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Ut=(Gt="concat",Wt>=51||!u((function(){var t=[];return(t.constructor={})[Jt]=function(){return{foo:1}},1!==t[Gt](Boolean).foo}))),Vt=function(t){if(!h(t))return!1;var n=t[Kt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,u,i,f,c=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[c]||C(c,{}):(o[c]||{}).prototype)for(e in n){if(i=n[e],u=t.noTargetGet?(f=xt(r,e))&&f.value:r[e],!Tt(a?e:c+(l?".":"#")+e,t.forced)&&void 0!==u){if(typeof i==typeof u)continue;vt(i,u)}(t.sham||u&&u.sham)&&M(i,"sham",!0),nt(r,e,i,t)}}({target:"Array",proto:!0,forced:!Qt||!Ut},{concat:function(t){var n,r,e,o,u,i=At(this),f=Lt(i,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(u=-1===n?i:arguments[n],Vt(u)){if(c+(o=at(u.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in u&&Mt(f,c,u[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(f,c++,u)}return f.length=c,f}}),t.fn.bootstrapTable.locales["zh-CN"]={formatLoadingMessage:function(){return"正在努力地加载数据中，请稍候"},formatRecordsPerPage:function(t){return"每页显示 ".concat(t," 条记录")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"显示第 ".concat(t," 到第 ").concat(n," 条记录，总共 ").concat(r," 条记录（从 ").concat(e," 总记录中过滤）"):"显示第 ".concat(t," 到第 ").concat(n," 条记录，总共 ").concat(r," 条记录")},formatSRPaginationPreText:function(){return"上一页"},formatSRPaginationPageText:function(t){return"第".concat(t,"页")},formatSRPaginationNextText:function(){return"下一页"},formatDetailPagination:function(t){return"总共 ".concat(t," 条记录")},formatClearSearch:function(){return"清空过滤"},formatSearch:function(){return"搜索"},formatNoMatches:function(){return"没有找到匹配的记录"},formatPaginationSwitch:function(){return"隐藏/显示分页"},formatPaginationSwitchDown:function(){return"显示分页"},formatPaginationSwitchUp:function(){return"隐藏分页"},formatRefresh:function(){return"刷新"},formatToggle:function(){return"切换"},formatToggleOn:function(){return"显示卡片视图"},formatToggleOff:function(){return"隐藏卡片视图"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"切换所有"},formatFullscreen:function(){return"全屏"},formatAllRows:function(){return"所有"},formatAutoRefresh:function(){return"自动刷新"},formatExport:function(){return"导出数据"},formatJumpTo:function(){return"跳转"},formatAdvancedSearch:function(){return"高级搜索"},formatAdvancedCloseButton:function(){return"关闭"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["zh-CN"])}));
diff --git a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
index 4feed19a..80fb5e59 100644
--- a/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
+++ b/cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
@@ -1,7 +1,10 @@
-/*
-* bootstrap-table - v1.12.1 - 2018-03-12
-* https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2018 zhixin wen
-* Licensed MIT License
-*/
-!function(a){"use strict";a.fn.bootstrapTable.locales["zh-TW"]={formatLoadingMessage:function(){return"正在努力地載入資料，請稍候……"},formatRecordsPerPage:function(a){return"每頁顯示 "+a+" 項記錄"},formatShowingRows:function(a,b,c){return"顯示第 "+a+" 到第 "+b+" 項記錄，總共 "+c+" 項記錄"},formatSearch:function(){return"搜尋"},formatNoMatches:function(){return"沒有找到符合的結果"},formatPaginationSwitch:function(){return"隱藏/顯示分頁"},formatRefresh:function(){return"重新整理"},formatToggle:function(){return"切換"},formatColumns:function(){return"列"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["zh-TW"])}(jQuery);
\ No newline at end of file
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.16.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t,n){return t(n={exports:{}},n.exports),n.exports}var e=function(t){return t&&t.Math==Math&&t},o=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof n&&n)||Function("return this")(),u=function(t){try{return!!t()}catch(t){return!0}},i=!u((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),f={}.propertyIsEnumerable,c=Object.getOwnPropertyDescriptor,a={f:c&&!f.call({1:2},1)?function(t){var n=c(this,t);return!!n&&n.enumerable}:f},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,g=u((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,m=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},d=function(t){return g(m(t))},h=function(t){return"object"==typeof t?null!==t:"function"==typeof t},v=function(t,n){if(!h(t))return t;var r,e;if(n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;if("function"==typeof(r=t.valueOf)&&!h(e=r.call(t)))return e;if(!n&&"function"==typeof(r=t.toString)&&!h(e=r.call(t)))return e;throw TypeError("Can't convert object to primitive value")},b={}.hasOwnProperty,w=function(t,n){return b.call(t,n)},S=o.document,O=h(S)&&h(S.createElement),T=!i&&!u((function(){return 7!=Object.defineProperty((t="div",O?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),j=Object.getOwnPropertyDescriptor,P={f:i?j:function(t,n){if(t=d(t),n=v(n,!0),T)try{return j(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!h(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,A={f:i?E:function(t,n,r){if(x(t),n=v(n,!0),x(r),T)try{return E(t,n,r)}catch(t){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(t[n]=r.value),t}},M=i?function(t,n,r){return A.f(t,n,l(1,r))}:function(t,n,r){return t[n]=r,t},_=function(t,n){try{M(o,t,n)}catch(r){o[t]=n}return n},C=o["__core-js_shared__"]||_("__core-js_shared__",{}),R=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return R.call(t)});var N,k,F,I,L=C.inspectSource,z=o.WeakMap,D="function"==typeof z&&/native code/.test(L(z)),q=r((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),W=0,B=Math.random(),G=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++W+B).toString(36)},J=q("keys"),K={},Q=o.WeakMap;if(D){var U=new Q,V=U.get,Y=U.has,H=U.set;N=function(t,n){return H.call(U,t,n),n},k=function(t){return V.call(U,t)||{}},F=function(t){return Y.call(U,t)}}else{var X=J[I="state"]||(J[I]=G(I));K[X]=!0,N=function(t,n){return M(t,X,n),n},k=function(t){return w(t,X)?t[X]:{}},F=function(t){return w(t,X)}}var Z,$,tt={set:N,get:k,has:F,enforce:function(t){return F(t)?k(t):N(t,{})},getterFor:function(t){return function(n){var r;if(!h(n)||(r=k(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}},nt=r((function(t){var n=tt.get,r=tt.enforce,e=String(String).split("String");(t.exports=function(t,n,u,i){var f=!!i&&!!i.unsafe,c=!!i&&!!i.enumerable,a=!!i&&!!i.noTargetGet;"function"==typeof u&&("string"!=typeof n||w(u,"name")||M(u,"name",n),r(u).source=e.join("string"==typeof n?n:"")),t!==o?(f?!a&&t[n]&&(c=!0):delete t[n],c?t[n]=u:M(t,n,u)):c?t[n]=u:_(n,u)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,et=function(t){return"function"==typeof t?t:void 0},ot=function(t,n){return arguments.length<2?et(rt[t])||et(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},ut=Math.ceil,it=Math.floor,ft=function(t){return isNaN(t=+t)?0:(t>0?it:ut)(t)},ct=Math.min,at=function(t){return t>0?ct(ft(t),9007199254740991):0},lt=Math.max,st=Math.min,pt=function(t){return function(n,r,e){var o,u=d(n),i=at(u.length),f=function(t,n){var r=ft(t);return r<0?lt(r+n,0):st(r,n)}(e,i);if(t&&r!=r){for(;i>f;)if((o=u[f++])!=o)return!0}else for(;i>f;f++)if((t||f in u)&&u[f]===r)return t||f||0;return!t&&-1}},yt={includes:pt(!0),indexOf:pt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return function(t,n){var r,e=d(t),o=0,u=[];for(r in e)!w(K,r)&&w(e,r)&&u.push(r);for(;n.length>o;)w(e,r=n[o++])&&(~yt(u,r)||u.push(r));return u}(t,gt)}},dt={f:Object.getOwnPropertySymbols},ht=ot("Reflect","ownKeys")||function(t){var n=mt.f(x(t)),r=dt.f;return r?n.concat(r(t)):n},vt=function(t,n){for(var r=ht(n),e=A.f,o=P.f,u=0;u<r.length;u++){var i=r[u];w(t,i)||e(t,i,o(n,i))}},bt=/#|\.prototype\./,wt=function(t,n){var r=Ot[St(t)];return r==jt||r!=Tt&&("function"==typeof n?u(n):!!n)},St=wt.normalize=function(t){return String(t).replace(bt,".").toLowerCase()},Ot=wt.data={},Tt=wt.NATIVE="N",jt=wt.POLYFILL="P",Pt=wt,xt=P.f,Et=Array.isArray||function(t){return"Array"==p(t)},At=function(t){return Object(m(t))},Mt=function(t,n,r){var e=v(n);e in t?A.f(t,e,l(0,r)):t[e]=r},_t=!!Object.getOwnPropertySymbols&&!u((function(){return!String(Symbol())})),Ct=_t&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=q("wks"),Nt=o.Symbol,kt=Ct?Nt:G,Ft=function(t){return w(Rt,t)||(_t&&w(Nt,t)?Rt[t]=Nt[t]:Rt[t]=kt("Symbol."+t)),Rt[t]},It=Ft("species"),Lt=function(t,n){var r;return Et(t)&&("function"!=typeof(r=t.constructor)||r!==Array&&!Et(r.prototype)?h(r)&&null===(r=r[It])&&(r=void 0):r=void 0),new(void 0===r?Array:r)(0===n?0:n)},zt=ot("navigator","userAgent")||"",Dt=o.process,qt=Dt&&Dt.versions,Wt=qt&&qt.v8;Wt?$=(Z=Wt.split("."))[0]+Z[1]:zt&&(!(Z=zt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=zt.match(/Chrome\/(\d+)/))&&($=Z[1]);var Bt,Gt=$&&+$,Jt=Ft("species"),Kt=Ft("isConcatSpreadable"),Qt=Gt>=51||!u((function(){var t=[];return t[Kt]=!1,t.concat()[0]!==t})),Ut=(Bt="concat",Gt>=51||!u((function(){var t=[];return(t.constructor={})[Jt]=function(){return{foo:1}},1!==t[Bt](Boolean).foo}))),Vt=function(t){if(!h(t))return!1;var n=t[Kt];return void 0!==n?!!n:Et(t)};!function(t,n){var r,e,u,i,f,c=t.target,a=t.global,l=t.stat;if(r=a?o:l?o[c]||_(c,{}):(o[c]||{}).prototype)for(e in n){if(i=n[e],u=t.noTargetGet?(f=xt(r,e))&&f.value:r[e],!Pt(a?e:c+(l?".":"#")+e,t.forced)&&void 0!==u){if(typeof i==typeof u)continue;vt(i,u)}(t.sham||u&&u.sham)&&M(i,"sham",!0),nt(r,e,i,t)}}({target:"Array",proto:!0,forced:!Qt||!Ut},{concat:function(t){var n,r,e,o,u,i=At(this),f=Lt(i,0),c=0;for(n=-1,e=arguments.length;n<e;n++)if(u=-1===n?i:arguments[n],Vt(u)){if(c+(o=at(u.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(r=0;r<o;r++,c++)r in u&&Mt(f,c,u[r])}else{if(c>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Mt(f,c++,u)}return f.length=c,f}}),t.fn.bootstrapTable.locales["zh-TW"]={formatLoadingMessage:function(){return"正在努力地載入資料，請稍候"},formatRecordsPerPage:function(t){return"每頁顯示 ".concat(t," 項記錄")},formatShowingRows:function(t,n,r,e){return void 0!==e&&e>0&&e>r?"顯示第 ".concat(t," 到第 ").concat(n," 項記錄，總共 ").concat(r," 項記錄（從 ").concat(e," 總記錄中過濾）"):"顯示第 ".concat(t," 到第 ").concat(n," 項記錄，總共 ").concat(r," 項記錄")},formatSRPaginationPreText:function(){return"上一頁"},formatSRPaginationPageText:function(t){return"第".concat(t,"頁")},formatSRPaginationNextText:function(){return"下一頁"},formatDetailPagination:function(t){return"總共 ".concat(t," 項記錄")},formatClearSearch:function(){return"清空過濾"},formatSearch:function(){return"搜尋"},formatNoMatches:function(){return"沒有找到符合的結果"},formatPaginationSwitch:function(){return"隱藏/顯示分頁"},formatPaginationSwitchDown:function(){return"顯示分頁"},formatPaginationSwitchUp:function(){return"隱藏分頁"},formatRefresh:function(){return"重新整理"},formatToggle:function(){return"切換"},formatToggleOn:function(){return"顯示卡片視圖"},formatToggleOff:function(){return"隱藏卡片視圖"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"切換所有"},formatFullscreen:function(){return"全屏"},formatAllRows:function(){return"所有"},formatAutoRefresh:function(){return"自動刷新"},formatExport:function(){return"導出數據"},formatJumpTo:function(){return"跳轉"},formatAdvancedSearch:function(){return"高級搜尋"},formatAdvancedCloseButton:function(){return"關閉"}},t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["zh-TW"])}));
diff --git a/cps/static/js/libs/epub.min.js b/cps/static/js/libs/epub.min.js
index 143f24af..60719ba5 100644
--- a/cps/static/js/libs/epub.min.js
+++ b/cps/static/js/libs/epub.min.js
@@ -1 +1 @@
-(function(e,t){'object'==typeof exports&&'object'==typeof module?module.exports=t(require('xmldom'),function(){try{return require('jszip')}catch(t){}}()):'function'==typeof define&&define.amd?define(['xmldom','jszip'],t):'object'==typeof exports?exports.ePub=t(require('xmldom'),function(){try{return require('jszip')}catch(t){}}()):e.ePub=t(e.xmldom,e.jszip)})(this,function(e,t){var n=String.prototype,a=Math.ceil,i=Math.round,o=Math.max,s=Math.floor;return function(e){function t(a){if(n[a])return n[a].exports;var i=n[a]={i:a,l:!1,exports:{}};return e[a].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,a){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:a})},t.n=function(e){var n=e&&e.__esModule?function(){return e['default']}:function(){return e};return t.d(n,'a',n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p='/dist/',t(t.s=25)}([function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}function i(){var e=new Date().getTime(),t='xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g,function(t){var n=0|(e+16*Math.random())%16;return e=s(e/16),('x'==t?n:8|7&n).toString(16)});return t}function r(e){return!isNaN(parseFloat(e))&&isFinite(e)}function l(e,t,n,a,i){var o=a||0,s=i||t.length,r=parseInt(o+(s-o)/2),d;return(n||(n=function(e,t){return e>t?1:e<t?-1:e==t?0:void 0}),0>=s-o)?r:(d=n(t[r],e),1==s-o?0<=d?r:r+1:0===d?r:-1===d?l(e,t,n,r,s):l(e,t,n,o,r))}function d(e,t,n,a,i){var o=a||0,s=i||t.length,r=parseInt(o+(s-o)/2),l;return(n||(n=function(e,t){return e>t?1:e<t?-1:e==t?0:void 0}),0>=s-o)?-1:(l=n(t[r],e),1==s-o?0===l?r:-1:0===l?r:-1===l?d(e,t,n,r,s):d(e,t,n,o,r))}function u(e,t){for(var n=e.parentNode,a=n.childNodes,o=-1,s=0,i;s<a.length&&(i=a[s],i.nodeType===t&&o++,i!=e);s++);return o}function c(e,t){return new Blob([e],{type:t})}function p(e,t){return'undefined'==typeof e.querySelector?e.getElementsByTagName(t):e.querySelectorAll(t)}function h(e,t,n){for(var a=document.createTreeWalker(e,n,null,!1),i;i=a.nextNode();)t(i)}function g(e,t){if(t(e))return!0;if(e=e.firstChild,e)do{var n=g(e,t);if(n)return!0;e=e.nextSibling}while(e)}function f(e){for(var t=[e];e;e=e.parentNode)t.unshift(e);return t}Object.defineProperty(t,'__esModule',{value:!0});var m=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}();t.uuid=i,t.documentHeight=function(){return o(document.documentElement.clientHeight,document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight)},t.isElement=function(e){return!!(e&&1==e.nodeType)},t.isNumber=r,t.isFloat=function(e){var t=parseFloat(e);return t===e&&r(e)&&s(t)!==e},t.prefixed=function(e){var t=['Webkit','webkit','Moz','O','ms'],n=['-webkit-','-webkit-','-moz-','-o-','-ms-'],a=e[0].toUpperCase()+e.slice(1),o=t.length;if('undefined'==typeof document||'undefined'!=typeof document.body.style[e])return e;for(var s=0;s<o;s++)if('undefined'!=typeof document.body.style[t[s]+a])return n[s]+e;return e},t.defaults=function(e){for(var t=1,n=arguments.length,a;t<n;t++)for(var i in a=arguments[t],a)void 0===e[i]&&(e[i]=a[i]);return e},t.extend=function(e){var t=[].slice.call(arguments,1);return t.forEach(function(t){t&&Object.getOwnPropertyNames(t).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))})}),e},t.insert=function(e,t,n){var a=l(e,t,n);return t.splice(a,0,e),a},t.locationOf=l,t.indexOfSorted=d,t.bounds=function(e){var t=window.getComputedStyle(e),n=0,a=0;return['width','paddingRight','paddingLeft','marginRight','marginLeft','borderRightWidth','borderLeftWidth'].forEach(function(e){n+=parseFloat(t[e])||0}),['height','paddingTop','paddingBottom','marginTop','marginBottom','borderTopWidth','borderBottomWidth'].forEach(function(e){a+=parseFloat(t[e])||0}),{height:a,width:n}},t.borders=function(e){var t=window.getComputedStyle(e),n=0,a=0;return['paddingRight','paddingLeft','marginRight','marginLeft','borderRightWidth','borderLeftWidth'].forEach(function(e){n+=parseFloat(t[e])||0}),['paddingTop','paddingBottom','marginTop','marginBottom','borderTopWidth','borderBottomWidth'].forEach(function(e){a+=parseFloat(t[e])||0}),{height:a,width:n}},t.windowBounds=function(){var e=window.innerWidth,t=window.innerHeight;return{top:0,left:0,right:e,bottom:t,width:e,height:t}},t.indexOfNode=u,t.indexOfTextNode=function(e){return u(e,b)},t.indexOfElementNode=function(e){return u(e,v)},t.isXml=function(e){return-1<['xml','opf','ncx'].indexOf(e)},t.createBlob=c,t.createBlobUrl=function(e,t){var n=c(e,t),a;return a=k.createObjectURL(n),a},t.revokeBlobUrl=function(e){return k.revokeObjectURL(e)},t.createBase64Url=function(e,t){var n,a;if('string'==typeof e)return n=btoa(encodeURIComponent(e)),a='data:'+t+';base64,'+n,a},t.type=function(e){return Object.prototype.toString.call(e).slice(8,-1)},t.parse=function(e,t,a){var i,o;return o='undefined'==typeof DOMParser||a?n(16).DOMParser:DOMParser,65279===e.charCodeAt(0)&&(e=e.slice(1)),i=new o().parseFromString(e,t),i},t.qs=function(e,t){var n;if(!e)throw new Error('No Element Provided');return'undefined'==typeof e.querySelector?(n=e.getElementsByTagName(t),n.length)?n[0]:void 0:e.querySelector(t)},t.qsa=p,t.qsp=function(e,t,n){var a,i;if('undefined'!=typeof e.querySelector){for(var o in t+='[',n)t+=o+'~=\''+n[o]+'\'';return t+=']',e.querySelector(t)}return(a=e.getElementsByTagName(t),i=Array.prototype.slice.call(a,0).filter(function(e){for(var t in n)if(e.getAttribute(t)===n[t])return!0;return!1}),i)?i[0]:void 0},t.sprint=function(e,t){var n=e.ownerDocument||e;'undefined'==typeof n.createTreeWalker?g(e,function(e){e&&3===e.nodeType&&t(e)},!0):h(e,t,NodeFilter.SHOW_TEXT)},t.treeWalker=h,t.walk=g,t.blob2base64=function(e){return new Promise(function(t){var n=new FileReader;n.readAsDataURL(e),n.onloadend=function(){t(n.result)}})},t.defer=function(){var e=this;this.resolve=null,this.reject=null,this.id=i(),this.promise=new Promise(function(t,n){e.resolve=t,e.reject=n}),Object.freeze(this)},t.querySelectorByType=function(e,t,n){var a;if('undefined'!=typeof e.querySelector&&(a=e.querySelector(t+'[*|type="'+n+'"]')),!a||0===a.length){a=p(e,t);for(var o=0;o<a.length;o++)if(a[o].getAttributeNS('http://www.idpf.org/2007/ops','type')===n||a[o].getAttribute('epub:type')===n)return a[o]}else return a},t.findChildren=function(e){for(var t=[],n=e.childNodes,a=0,i;a<n.length;a++)i=n[a],1===i.nodeType&&t.push(i);return t},t.parents=f,t.filterChildren=function(e,t,n){for(var a=[],o=e.childNodes,s=0,i;s<o.length;s++)if(i=o[s],1===i.nodeType&&i.nodeName.toLowerCase()===t){if(n)return i;a.push(i)}if(!n)return a},t.getParentByTagName=function(e,t){var n;if(null!==e&&''!==t)for(n=e.parentNode;1===n.nodeType;){if(n.tagName.toLowerCase()===t)return n;n=n.parentNode}};var y=t.requestAnimationFrame='undefined'!=typeof window&&(window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame),v=1,b=3,k='undefined'==typeof URL?'undefined'==typeof window?void 0:window.URL||window.webkitURL||window.mozURL:URL,x=t.RangeObject=function(){function e(){a(this,e),this.collapsed=!1,this.commonAncestorContainer=void 0,this.endContainer=void 0,this.endOffset=void 0,this.startContainer=void 0,this.startOffset=void 0}return m(e,[{key:'setStart',value:function(e,t){this.startContainer=e,this.startOffset=t,this.endContainer?this.commonAncestorContainer=this._commonAncestorContainer():this.collapse(!0),this._checkCollapsed()}},{key:'setEnd',value:function(e,t){this.endContainer=e,this.endOffset=t,this.startContainer?(this.collapsed=!1,this.commonAncestorContainer=this._commonAncestorContainer()):this.collapse(!1),this._checkCollapsed()}},{key:'collapse',value:function(e){this.collapsed=!0,e?(this.endContainer=this.startContainer,this.endOffset=this.startOffset,this.commonAncestorContainer=this.startContainer.parentNode):(this.startContainer=this.endContainer,this.startOffset=this.endOffset,this.commonAncestorContainer=this.endOffset.parentNode)}},{key:'selectNode',value:function(e){var t=e.parentNode,n=Array.prototype.indexOf.call(t.childNodes,e);this.setStart(t,n),this.setEnd(t,n+1)}},{key:'selectNodeContents',value:function(e){var t=e.childNodes[e.childNodes-1],n=3===e.nodeType?e.textContent.length:parent.childNodes.length;this.setStart(e,0),this.setEnd(e,n)}},{key:'_commonAncestorContainer',value:function(e,t){var n=f(e||this.startContainer),a=f(t||this.endContainer);if(n[0]==a[0])for(var o=0;o<n.length;o++)if(n[o]!=a[o])return n[o-1]}},{key:'_checkCollapsed',value:function(){this.collapsed=this.startContainer===this.endContainer&&this.startOffset===this.endOffset}},{key:'toString',value:function(){}}]),e}()},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o='function'==typeof Symbol&&'symbol'==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&'function'==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?'symbol':typeof e},i=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(0),r=1,l=3,d=function(){function e(t,n,i){a(this,e);var r;if(this.str='',this.base={},this.spinePos=0,this.range=!1,this.path={},this.start=null,this.end=null,!(this instanceof e))return new e(t,n,i);if('string'==typeof n?this.base=this.parseComponent(n):'object'===('undefined'==typeof n?'undefined':o(n))&&n.steps&&(this.base=n),r=this.checkType(t),'string'===r)return this.str=t,(0,s.extend)(this,this.parse(t));if('range'===r)return(0,s.extend)(this,this.fromRange(t,this.base,i));if('node'===r)return(0,s.extend)(this,this.fromNode(t,this.base,i));if('EpubCFI'===r&&t.path)return t;if(!t)return this;throw new TypeError('not a valid argument for EpubCFI')}return i(e,[{key:'checkType',value:function(t){return this.isCfiString(t)?'string':'object'===('undefined'==typeof t?'undefined':o(t))&&('Range'===(0,s.type)(t)||'undefined'!=typeof t.startContainer)?'range':'object'===('undefined'==typeof t?'undefined':o(t))&&'undefined'!=typeof t.nodeType?'node':'object'===('undefined'==typeof t?'undefined':o(t))&&t instanceof e&&'EpubCFI'}},{key:'parse',value:function(e){var t={spinePos:-1,range:!1,base:{},path:{},start:null,end:null},n,a,i;return'string'==typeof e?(0===e.indexOf('epubcfi(')&&')'===e[e.length-1]&&(e=e.slice(8,e.length-1)),n=this.getChapterComponent(e),!n)?{spinePos:-1}:(t.base=this.parseComponent(n),a=this.getPathComponent(e),t.path=this.parseComponent(a),i=this.getRange(e),i&&(t.range=!0,t.start=this.parseComponent(i[0]),t.end=this.parseComponent(i[1])),t.spinePos=t.base.steps[1].index,t):{spinePos:-1}}},{key:'parseComponent',value:function(e){var t={steps:[],terminal:{offset:null,assertion:null}},n=e.split(':'),a=n[0].split('/'),i;return 1<n.length&&(i=n[1],t.terminal=this.parseTerminal(i)),''===a[0]&&a.shift(),t.steps=a.map(function(e){return this.parseStep(e)}.bind(this)),t}},{key:'parseStep',value:function(e){var t,n,a,i,o;if(i=e.match(/\[(.*)\]/),i&&i[1]&&(o=i[1]),n=parseInt(e),!isNaN(n))return 0==n%2?(t='element',a=n/2-1):(t='text',a=(n-1)/2),{type:t,index:a,id:o||null}}},{key:'parseTerminal',value:function(e){var t=e.match(/\[(.*)\]/),n,a;return t&&t[1]?(n=parseInt(e.split('[')[0]),a=t[1]):n=parseInt(e),(0,s.isNumber)(n)||(n=null),{offset:n,assertion:a}}},{key:'getChapterComponent',value:function(e){var t=e.split('!');return t[0]}},{key:'getPathComponent',value:function(e){var t=e.split('!');if(t[1]){var n=t[1].split(',');return n[0]}}},{key:'getRange',value:function(e){var t=e.split(',');return 3===t.length&&[t[1],t[2]]}},{key:'getCharecterOffsetComponent',value:function(e){var t=e.split(':');return t[1]||''}},{key:'joinSteps',value:function(e){return e?e.map(function(e){var t='';return'element'===e.type&&(t+=2*(e.index+1)),'text'===e.type&&(t+=1+2*e.index),e.id&&(t+='['+e.id+']'),t}).join('/'):''}},{key:'segmentString',value:function(e){var t='/';return t+=this.joinSteps(e.steps),e.terminal&&null!=e.terminal.offset&&(t+=':'+e.terminal.offset),e.terminal&&null!=e.terminal.assertion&&(t+='['+e.terminal.assertion+']'),t}},{key:'toString',value:function(){var e='epubcfi(';return e+=this.segmentString(this.base),e+='!',e+=this.segmentString(this.path),this.range&&this.start&&(e+=',',e+=this.segmentString(this.start)),this.range&&this.end&&(e+=',',e+=this.segmentString(this.end)),e+=')',e}},{key:'compare',value:function(t,n){var a,o,s,r,l,l;if('string'==typeof t&&(t=new e(t)),'string'==typeof n&&(n=new e(n)),t.spinePos>n.spinePos)return 1;if(t.spinePos<n.spinePos)return-1;t.range?(a=t.path.steps.concat(t.start.steps),s=t.start.terminal):(a=t.path.steps,s=t.path.terminal),n.range?(o=n.path.steps.concat(n.start.steps),r=n.start.terminal):(o=n.path.steps,r=n.path.terminal);for(var d=0;d<a.length;d++){if(!a[d])return-1;if(!o[d])return 1;if(a[d].index>o[d].index)return 1;if(a[d].index<o[d].index)return-1}return a.length<o.length?1:s.offset>r.offset?1:s.offset<r.offset?-1:0}},{key:'step',value:function(e){var t=e.nodeType===l?'text':'element';return{id:e.id,tagName:e.tagName,type:t,index:this.position(e)}}},{key:'filteredStep',value:function(e,t){var n=this.filter(e,t),a;if(n)return a=n.nodeType===l?'text':'element',{id:n.id,tagName:n.tagName,type:a,index:this.filteredPosition(n,t)}}},{key:'pathTo',value:function(e,t,n){for(var a={steps:[],terminal:{offset:null,assertion:null}},i=e,o;i&&i.parentNode&&i.parentNode.nodeType!=9;)o=n?this.filteredStep(i,n):this.step(i),o&&a.steps.unshift(o),i=i.parentNode;return null!=t&&0<=t&&(a.terminal.offset=t,'text'!=a.steps[a.steps.length-1].type&&a.steps.push({type:'text',index:0})),a}},{key:'equalStep',value:function(e,t){return e&&t&&e.index===t.index&&e.id===t.id&&e.type===t.type}},{key:'fromRange',value:function(e,t,n){var a={range:!1,base:{},path:{},start:null,end:null},s=e.startContainer,r=e.endContainer,l=e.startOffset,d=e.endOffset,u=!1;if(n&&(u=null!=s.ownerDocument.querySelector('.'+n)),'string'==typeof t?(a.base=this.parseComponent(t),a.spinePos=a.base.steps[1].index):'object'===('undefined'==typeof t?'undefined':o(t))&&(a.base=t),e.collapsed)u&&(l=this.patchOffset(s,l,n)),a.path=this.pathTo(s,l,n);else{a.range=!0,u&&(l=this.patchOffset(s,l,n)),a.start=this.pathTo(s,l,n),u&&(d=this.patchOffset(r,d,n)),a.end=this.pathTo(r,d,n),a.path={steps:[],terminal:null};var c=a.start.steps.length,p;for(p=0;p<c&&this.equalStep(a.start.steps[p],a.end.steps[p]);p++)p===c-1?a.start.terminal===a.end.terminal&&(a.path.steps.push(a.start.steps[p]),a.range=!1):a.path.steps.push(a.start.steps[p]);a.start.steps=a.start.steps.slice(a.path.steps.length),a.end.steps=a.end.steps.slice(a.path.steps.length)}return a}},{key:'fromNode',value:function(e,t,n){var a={range:!1,base:{},path:{},start:null,end:null};return'string'==typeof t?(a.base=this.parseComponent(t),a.spinePos=a.base.steps[1].index):'object'===('undefined'==typeof t?'undefined':o(t))&&(a.base=t),a.path=this.pathTo(e,null,n),a}},{key:'filter',value:function(e,t){var n=!1,a,i,o,s,r;return e.nodeType===l?(n=!0,o=e.parentNode,a=e.parentNode.classList.contains(t)):(n=!1,a=e.classList.contains(t)),a&&n?(s=o.previousSibling,r=o.nextSibling,s&&s.nodeType===l?i=s:r&&r.nodeType===l&&(i=r),i?i:e):a&&!n?!1:e}},{key:'patchOffset',value:function(e,t,n){if(e.nodeType!=l)throw new Error('Anchor must be a text node');var a=e,i=t;for(e.parentNode.classList.contains(n)&&(a=e.parentNode);a.previousSibling;){if(a.previousSibling.nodeType!==r)i+=a.previousSibling.textContent.length;else if(a.previousSibling.classList.contains(n))i+=a.previousSibling.textContent.length;else break;a=a.previousSibling}return i}},{key:'normalizedMap',value:function(e,t,n){var a={},o=-1,s=e.length,d,i,u;for(d=0;d<s;d++)i=e[d].nodeType,i===r&&e[d].classList.contains(n)&&(i=l),0<d&&i===l&&u===l?a[d]=o:t===i&&(++o,a[d]=o),u=i;return a}},{key:'position',value:function(e){var t,n;return e.nodeType===r?(t=e.parentNode.children,!t&&(t=(0,s.findChildren)(e.parentNode)),n=Array.prototype.indexOf.call(t,e)):(t=this.textNodes(e.parentNode),n=t.indexOf(e)),n}},{key:'filteredPosition',value:function(e,t){var n,a,i;return e.nodeType===r?(n=e.parentNode.children,i=this.normalizedMap(n,r,t)):(n=e.parentNode.childNodes,e.parentNode.classList.contains(t)&&(e=e.parentNode,n=e.parentNode.childNodes),i=this.normalizedMap(n,l,t)),a=Array.prototype.indexOf.call(n,e),i[a]}},{key:'stepsToXpath',value:function(e){var t=['.','*'];return e.forEach(function(e){var n=e.index+1;e.id?t.push('*[position()='+n+' and @id=\''+e.id+'\']'):'text'===e.type?t.push('text()['+n+']'):t.push('*['+n+']')}),t.join('/')}},{key:'stepsToQuerySelector',value:function(e){var t=['html'];return e.forEach(function(e){var n=e.index+1;e.id?t.push('#'+e.id):'text'===e.type||t.push('*:nth-child('+n+')')}),t.join('>')}},{key:'textNodes',value:function(e,t){return Array.prototype.slice.call(e.childNodes).filter(function(e){return e.nodeType===l||t&&e.classList.contains(t)})}},{key:'walkToNode',value:function(e,t,n){var a=t||document,o=a.documentElement,r=e.length,l,d,u;for(u=0;u<r&&(d=e[u],'element'===d.type?d.id?o=a.getElementById(d.id):(l=o.children||(0,s.findChildren)(o),o=l[d.index]):'text'===d.type&&(o=this.textNodes(o,n)[d.index]),!!o);u++);return o}},{key:'findNode',value:function(e,t,n){var a=t||document,i,o;return n||'undefined'==typeof a.evaluate?n?i=this.walkToNode(e,a,n):i=this.walkToNode(e,a):(o=this.stepsToXpath(e),i=a.evaluate(o,a,null,XPathResult.FIRST_ORDERED_NODE_TYPE,null).singleNodeValue),i}},{key:'fixMiss',value:function(e,t,n,a){var i=this.findNode(e.slice(0,-1),n,a),o=i.childNodes,s=this.normalizedMap(o,l,a),d=e[e.length-1].index,u,c;for(var p in s){if(!s.hasOwnProperty(p))return;if(s[p]===d)if(u=o[p],c=u.textContent.length,t>c)t-=c;else{i=u.nodeType===r?u.childNodes[0]:u;break}}return{container:i,offset:t}}},{key:'toRange',value:function(e,t){var n=e||document,a=this,i=!!t&&null!=n.querySelector('.'+t),o,r,l,d,u,c,p,h;if(o='undefined'==typeof n.createRange?new s.RangeObject:n.createRange(),a.range?(r=a.start,c=a.path.steps.concat(r.steps),d=this.findNode(c,n,i?t:null),l=a.end,p=a.path.steps.concat(l.steps),u=this.findNode(p,n,i?t:null)):(r=a.path,c=a.path.steps,d=this.findNode(a.path.steps,n,i?t:null)),d)try{null==r.terminal.offset?o.setStart(d,0):o.setStart(d,r.terminal.offset)}catch(a){h=this.fixMiss(c,r.terminal.offset,n,i?t:null),o.setStart(h.container,h.offset)}else return console.log('No startContainer found for',this.toString()),null;if(u)try{null==l.terminal.offset?o.setEnd(u,0):o.setEnd(u,l.terminal.offset)}catch(s){h=this.fixMiss(p,a.end.terminal.offset,n,i?t:null),o.setEnd(h.container,h.offset)}return o}},{key:'isCfiString',value:function(e){return'string'==typeof e&&0===e.indexOf('epubcfi(')&&')'===e[e.length-1]}},{key:'generateChapterComponent',value:function(e,t,n){var a=parseInt(t),i='/'+2*(e+1)+'/';return i+=2*(a+1),n&&(i+='['+n+']'),i}},{key:'collapse',value:function(e){this.range&&(this.range=!1,e?(this.path.steps=this.path.steps.concat(this.start.steps),this.path.terminal=this.start.terminal):(this.path.steps=this.path.steps.concat(this.end.steps),this.path.terminal=this.end.terminal))}}]),e}();t.default=d,e.exports=t['default']},function(e,t,n){'use strict';var a=n(27),o=n(41),s=Function.prototype.apply,r=Function.prototype.call,i=Object.create,l=Object.defineProperty,d=Object.defineProperties,u=Object.prototype.hasOwnProperty,c={configurable:!0,enumerable:!1,writable:!0},p,h,g,f,m,y,v;p=function(e,t){var n;return o(t),u.call(this,'__ee__')?n=this.__ee__:(n=c.value=i(null),l(this,'__ee__',c),c.value=null),n[e]?'object'==typeof n[e]?n[e].push(t):n[e]=[n[e],t]:n[e]=t,this},h=function(e,t){var n,a;return o(t),a=this,p.call(this,e,n=function(){g.call(a,e,n),s.call(t,this,arguments)}),n.__eeOnceListener__=t,this},g=function(e,t){var n,a,s,r;if(o(t),!u.call(this,'__ee__'))return this;if(n=this.__ee__,!n[e])return this;if(a=n[e],'object'==typeof a)for(r=0;s=a[r];++r)(s===t||s.__eeOnceListener__===t)&&(2===a.length?n[e]=a[r?0:1]:a.splice(r,1));else(a===t||a.__eeOnceListener__===t)&&delete n[e];return this},f=function(e){var t,n,a,i,o;if(u.call(this,'__ee__')&&(i=this.__ee__[e],!!i))if('object'==typeof i){for(n=arguments.length,o=Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];for(i=i.slice(),t=0;a=i[t];++t)s.call(a,this,o)}else switch(arguments.length){case 1:r.call(i,this);break;case 2:r.call(i,this,arguments[1]);break;case 3:r.call(i,this,arguments[1],arguments[2]);break;default:for(n=arguments.length,o=Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];s.call(i,this,o);}},m={on:p,once:h,off:g,emit:f},y={on:a(p),once:a(h),off:a(g),emit:a(f)},v=d({},y),e.exports=t=function(e){return null==e?i(v):d(Object(e),y)},t.methods=m},function(e,t){'use strict';Object.defineProperty(t,'__esModule',{value:!0});var n=t.DOM_EVENTS=['keydown','keyup','keypressed','mouseup','mousedown','click','touchend','touchstart'],a=t.EVENTS={BOOK:{OPEN_FAILED:'openFailed'},CONTENTS:{EXPAND:'expand',RESIZE:'resize',SELECTED:'selected',SELECTED_RANGE:'selectedRange',LINK_CLICKED:'linkClicked'},LOCATIONS:{CHANGED:'changed'},MANAGERS:{RESIZE:'resize',RESIZED:'resized',ORIENTATION_CHANGE:'orientationchange',ADDED:'added',SCROLL:'scroll',SCROLLED:'scrolled'},VIEWS:{AXIS:'axis',LOAD_ERROR:'loaderror',RENDERED:'rendered',RESIZED:'resized',DISPLAYED:'displayed',SHOWN:'shown',HIDDEN:'hidden',MARK_CLICKED:'markClicked'},RENDITION:{STARTED:'started',ATTACHED:'attached',DISPLAYED:'displayed',DISPLAY_ERROR:'displayerror',RENDERED:'rendered',REMOVED:'removed',RESIZED:'resized',ORIENTATION_CHANGE:'orientationchange',LOCATION_CHANGED:'locationChanged',RELOCATED:'relocated',MARK_CLICKED:'markClicked',SELECTED:'selected',LAYOUT:'layout'},LAYOUT:{UPDATED:'updated'}}},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var i=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),o=n(6),s=function(e){return e&&e.__esModule?e:{default:e}}(o),r=function(){function e(t){a(this,e);var n,i;n=t.indexOf('://'),-1<n&&(t=new URL(t).pathname),i=this.parse(t),this.path=t,this.directory=this.isDirectory(t)?t:i.dir+'/',this.filename=i.base,this.extension=i.ext.slice(1)}return i(e,[{key:'parse',value:function(e){return s.default.parse(e)}},{key:'isAbsolute',value:function(e){return s.default.isAbsolute(e||this.path)}},{key:'isDirectory',value:function(e){return'/'===e.charAt(e.length-1)}},{key:'resolve',value:function(e){return s.default.resolve(this.directory,e)}},{key:'relative',value:function(e){return s.default.relative(this.directory,e)}},{key:'splitPath',value:function(e){return this.splitPathRe.exec(e).slice(1)}},{key:'toString',value:function(){return this.path}}]),e}();t.default=r,e.exports=t['default']},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(4),r=a(s),l=n(6),d=a(l),u=function(){function e(t,n){i(this,e);var a=-1<t.indexOf('://'),o=t,s;if(this.Url=void 0,this.href=t,this.protocol='',this.origin='',this.hash='',this.hash='',this.search='',this.base=n,!a&&!1!==n&&'string'!=typeof n&&window&&window.location&&(this.base=window.location.href),a||this.base)try{this.Url=this.base?new URL(t,this.base):new URL(t),this.href=this.Url.href,this.protocol=this.Url.protocol,this.origin=this.Url.origin,this.hash=this.Url.hash,this.search=this.Url.search,o=this.Url.pathname}catch(t){this.Url=void 0,this.base&&(s=new r.default(this.base),o=s.resolve(o))}this.Path=new r.default(o),this.directory=this.Path.directory,this.filename=this.Path.filename,this.extension=this.Path.extension}return o(e,[{key:'path',value:function(){return this.Path}},{key:'resolve',value:function(e){var t=-1<e.indexOf('://'),n;return t?e:(n=d.default.resolve(this.directory,e),this.origin+n)}},{key:'relative',value:function(e){return d.default.relative(e,this.directory)}},{key:'toString',value:function(){return this.href}}]),e}();t.default=u,e.exports=t['default']},function(e){'use strict';function t(e){if('string'!=typeof e)throw new TypeError('Path must be a string. Received '+e)}function n(e,t){for(var n='',a=-1,o=0,s=0,i;s<=e.length;++s){if(s<e.length)i=e.charCodeAt(s);else if(47===i)break;else i=47;if(47===i){if(a==s-1||1==o);else if(a!=s-1&&2==o){if(2>n.length||46!==n.charCodeAt(n.length-1)||46!==n.charCodeAt(n.length-2))if(2<n.length){for(var r=n.length-1,l=r;0<=l&&47!==n.charCodeAt(l);--l);if(l!=r){n=-1==l?'':n.slice(0,l),a=s,o=0;continue}}else if(2===n.length||1===n.length){n='',a=s,o=0;continue}t&&(0<n.length?n+='/..':n='..')}else 0<n.length?n+='/'+e.slice(a+1,s):n=e.slice(a+1,s);a=s,o=0}else 46===i&&-1!=o?++o:o=-1}return n}function a(e,t){var n=t.dir||t.root,a=t.base||(t.name||'')+(t.ext||'');return n?n===t.root?n+a:n+e+a:a}if(!o)var o={cwd:function(){return'/'}};var s={resolve:function(){for(var e='',a=!1,s=arguments.length-1,i;-1<=s&&!a;s--){var r;(0<=s?r=arguments[s]:(void 0==i&&(i=o.cwd()),r=i),t(r),0!==r.length)&&(e=r+'/'+e,a=47===r.charCodeAt(0))}return e=n(e,!a),a?0<e.length?'/'+e:'/':0<e.length?e:'.'},normalize:function(e){if(t(e),0===e.length)return'.';var a=47===e.charCodeAt(0),i=47===e.charCodeAt(e.length-1);return e=n(e,!a),0!==e.length||a||(e='.'),0<e.length&&i&&(e+='/'),a?'/'+e:e},isAbsolute:function(e){return t(e),0<e.length&&47===e.charCodeAt(0)},join:function(){if(0===arguments.length)return'.';for(var e=0,n,a;e<arguments.length;++e)a=arguments[e],t(a),0<a.length&&(void 0==n?n=a:n+='/'+a);return void 0===n?'.':s.normalize(n)},relative:function(e,n){if(t(e),t(n),e===n)return'';if(e=s.resolve(e),n=s.resolve(n),e===n)return'';for(var a=1;a<e.length&&47===e.charCodeAt(a);++a);for(var o=e.length,r=o-a,l=1;l<n.length&&47===n.charCodeAt(l);++l);for(var d=n.length,u=d-l,c=r<u?r:u,p=-1,h=0;h<=c;++h){if(h==c){if(u>c){if(47===n.charCodeAt(l+h))return n.slice(l+h+1);if(0==h)return n.slice(l+h)}else r>c&&(47===e.charCodeAt(a+h)?p=h:0==h&&(p=0));break}var i=e.charCodeAt(a+h),g=n.charCodeAt(l+h);if(i!==g)break;else 47===i&&(p=h)}var f='';for(h=a+p+1;h<=o;++h)(h===o||47===e.charCodeAt(h))&&(f+=0===f.length?'..':'/..');return 0<f.length?f+n.slice(l+p):(l+=p,47===n.charCodeAt(l)&&++l,n.slice(l))},_makeLong:function(e){return e},dirname:function(e){if(t(e),0===e.length)return'.';for(var n=e.charCodeAt(0),a=47===n,o=-1,s=!0,r=e.length-1;1<=r;--r)if(n=e.charCodeAt(r),47!==n)s=!1;else if(!s){o=r;break}return-1===o?a?'/':'.':a&&1===o?'//':e.slice(0,o)},basename:function(e,n){if(n!==void 0&&'string'!=typeof n)throw new TypeError('"ext" argument must be a string');t(e);var a=0,o=-1,s=!0,r;if(void 0!==n&&0<n.length&&n.length<=e.length){if(n.length===e.length&&n===e)return'';var i=n.length-1,l=-1;for(r=e.length-1;0<=r;--r){var d=e.charCodeAt(r);if(47!==d)-1==l&&(s=!1,l=r+1),0<=i&&(d===n.charCodeAt(i)?-1==--i&&(o=r):(i=-1,o=l));else if(!s){a=r+1;break}}return a===o?o=l:-1===o&&(o=e.length),e.slice(a,o)}for(r=e.length-1;0<=r;--r)if(47!==e.charCodeAt(r))-1==o&&(s=!1,o=r+1);else if(!s){a=r+1;break}return-1===o?'':e.slice(a,o)},extname:function(e){t(e);for(var n=-1,a=0,o=-1,s=!0,r=0,l=e.length-1,i;0<=l;--l){if(i=e.charCodeAt(l),47===i){if(!s){a=l+1;break}continue}-1==o&&(s=!1,o=l+1),46===i?-1==n?n=l:1!=r&&(r=1):-1!==n&&(r=-1)}return-1===n||-1===o||0==r||1==r&&n===o-1&&n===a+1?'':e.slice(n,o)},format:function(e){if(null===e||'object'!=typeof e)throw new TypeError('Parameter "pathObject" must be an object, not '+typeof e);return a('/',e)},parse:function(e){t(e);var n={root:'',dir:'',base:'',ext:'',name:''};if(0===e.length)return n;var a=e.charCodeAt(0),o=47===a,s;o?(n.root='/',s=1):s=0;for(var r=-1,l=0,d=-1,u=!0,c=e.length-1,i=0;c>=s;--c){if(a=e.charCodeAt(c),47===a){if(!u){l=c+1;break}continue}-1==d&&(u=!1,d=c+1),46===a?-1==r?r=c:1!=i&&(i=1):-1!=r&&(i=-1)}return-1==r||-1==d||0==i||1==i&&r==d-1&&r==l+1?-1!=d&&(0==l&&o?n.base=n.name=e.slice(1,d):n.base=n.name=e.slice(l,d)):(0==l&&o?(n.name=e.slice(1,r),n.base=e.slice(1,d)):(n.name=e.slice(l,r),n.base=e.slice(l,d)),n.ext=e.slice(r,d)),0<l?n.dir=e.slice(0,l-1):o&&(n.dir='/'),n},sep:'/',delimiter:':',posix:null};e.exports=s},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,'__esModule',{value:!0}),t.replaceBase=function(e,t){var n=t.url,a=-1<n.indexOf('://'),i,s;e&&(s=(0,o.qs)(e,'head'),i=(0,o.qs)(s,'base'),!i&&(i=e.createElement('base'),s.insertBefore(i,s.firstChild)),!a&&window&&window.location&&(n=window.location.origin+n),i.setAttribute('href',n))},t.replaceCanonical=function(e,t){var n=t.canonical,a,i;e&&(a=(0,o.qs)(e,'head'),i=(0,o.qs)(a,'link[rel=\'canonical\']'),i?i.setAttribute('href',n):(i=e.createElement('link'),i.setAttribute('rel','canonical'),i.setAttribute('href',n),a.appendChild(i)))},t.replaceMeta=function(e,t){var n=t.idref,a,i;e&&(a=(0,o.qs)(e,'head'),i=(0,o.qs)(a,'link[property=\'dc.identifier\']'),i?i.setAttribute('content',n):(i=e.createElement('meta'),i.setAttribute('name','dc.identifier'),i.setAttribute('content',n),a.appendChild(i)))},t.replaceLinks=function(e,t){var n=e.querySelectorAll('a[href]');if(n.length)for(var a=(0,o.qs)(e.ownerDocument,'base'),r=a?a.getAttribute('href'):void 0,l=function(e){var n=e.getAttribute('href');if(0!==n.indexOf('mailto:')){var a=-1<n.indexOf('://'),i=new s.default(n,r);a?e.setAttribute('target','_blank'):e.onclick=function(){return i&&i.hash?t(i.Path.path+i.hash):i?t(i.Path.path):t(n),!1}}}.bind(this),d=0;d<n.length;d++)l(n[d])},t.substitute=function(e,t,n){return t.forEach(function(t,a){t&&n[a]&&(e=e.replace(new RegExp(t,'g'),n[a]))}),e};var o=n(0),i=n(5),s=a(i),r=n(4),l=a(r)},function(e){var t=function(){return this}();try{t=t||Function('return this')()||(1,eval)('this')}catch(n){'object'==typeof window&&(t=window)}e.exports=t},function(e,t,n){'use strict';var a=n(34)();e.exports=function(e){return e!==a&&null!==e}},function(e,t){'use strict';function n(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var a=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),i=function(){function e(t){n(this,e),this.context=t||this,this.hooks=[]}return a(e,[{key:'register',value:function(){for(var e=0;e<arguments.length;++e)if('function'==typeof arguments[e])this.hooks.push(arguments[e]);else for(var t=0;t<arguments[e].length;++t)this.hooks.push(arguments[e][t])}},{key:'trigger',value:function(){var e=arguments,t=this.context,n=[];return this.hooks.forEach(function(a){var i=a.apply(t,e);i&&'function'==typeof i.then&&n.push(i)}),Promise.all(n)}},{key:'list',value:function(){return this.hooks}},{key:'clear',value:function(){return this.hooks=[]}}]),e}();t.default=i,e.exports=t['default']},function(e,t,n){'use strict';Object.defineProperty(t,'__esModule',{value:!0});var a=n(0),i=n(4),o=function(e){return e&&e.__esModule?e:{default:e}}(i);t.default=function(e,t,n,i){function s(t){u.reject(t)}function r(){if(this.readyState===XMLHttpRequest.DONE){var e=!1;if((''===this.responseType||'document'===this.responseType)&&(e=this.responseXML),200===this.status||e){var n;if(!this.response&&!e)return u.reject({status:this.status,message:'Empty Response',stack:new Error().stack}),u.promise;if(403===this.status)return u.reject({status:this.status,response:this.response,message:'Forbidden',stack:new Error().stack}),u.promise;n=e?this.responseXML:(0,a.isXml)(t)?(0,a.parse)(this.response,'text/xml'):'xhtml'==t?(0,a.parse)(this.response,'application/xhtml+xml'):'html'==t||'htm'==t?(0,a.parse)(this.response,'text/html'):'json'==t?JSON.parse(this.response):'blob'==t?l?this.response:new Blob([this.response]):this.response,u.resolve(n)}else u.reject({status:this.status,message:this.response,stack:new Error().stack})}}var l='undefined'!=typeof window&&window.URL,d=l?'blob':'arraybuffer',u=new a.defer,c=new XMLHttpRequest,p=XMLHttpRequest.prototype,h;for(h in'overrideMimeType'in p||Object.defineProperty(p,'overrideMimeType',{value:function(){}}),n&&(c.withCredentials=!0),c.onreadystatechange=r,c.onerror=s,c.open('GET',e,!0),i)c.setRequestHeader(h,i[h]);return'json'==t&&c.setRequestHeader('Accept','application/json'),t||(t=new o.default(e).extension),'blob'==t&&(c.responseType=d),(0,a.isXml)(t)&&c.overrideMimeType('text/xml'),'xhtml'==t,'html'!=t&&'htm'!=t,'binary'==t&&(c.responseType='arraybuffer'),c.send(),u.promise},e.exports=t['default']},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0}),t.Task=void 0;var i=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),o=n(0),s=function(){function e(t){a(this,e),this._q=[],this.context=t,this.tick=o.requestAnimationFrame,this.running=!1,this.paused=!1}return i(e,[{key:'enqueue',value:function(){var e=[].shift.call(arguments),t=arguments,n,a,i;if(!e)throw new Error('No Task Provided');return'function'==typeof e?(n=new o.defer,a=n.promise,i={task:e,args:t,deferred:n,promise:a}):i={promise:e},this._q.push(i),!1!=this.paused||this.running||this.run(),i.promise}},{key:'dequeue',value:function(){var e,t,n;if(this._q.length&&!this.paused){if(e=this._q.shift(),t=e.task,t)return n=t.apply(this.context,e.args),n&&'function'==typeof n.then?n.then(function(){e.deferred.resolve.apply(this.context,arguments)}.bind(this),function(){e.deferred.reject.apply(this.context,arguments)}.bind(this)):(e.deferred.resolve.apply(this.context,n),e.promise);if(e.promise)return e.promise}else return e=new o.defer,e.deferred.resolve(),e.promise}},{key:'dump',value:function(){for(;this._q.length;)this.dequeue()}},{key:'run',value:function(){var e=this;return this.running||(this.running=!0,this.defered=new o.defer),this.tick.call(window,function(){e._q.length?e.dequeue().then(function(){this.run()}.bind(e)):(e.defered.resolve(),e.running=void 0)}),!0==this.paused&&(this.paused=!1),this.defered.promise}},{key:'flush',value:function(){return this.running?this.running:this._q.length?(this.running=this.dequeue().then(function(){return this.running=void 0,this.flush()}.bind(this)),this.running):void 0}},{key:'clear',value:function(){this._q=[]}},{key:'length',value:function(){return this._q.length}},{key:'pause',value:function(){this.paused=!0}},{key:'stop',value:function(){this._q=[],this.running=!1,this.paused=!0}}]),e}();t.default=s,t.Task=function e(t,n,i){return a(this,e),function(){var e=this,n=arguments||[];return new Promise(function(a,o){n.push(function(e,t){!e&&t?o(t):a(e)}),t.apply(i||e,n)})}}},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var s=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),r=n(2),l=a(r),d=n(0),u=n(1),c=a(u),p=n(19),h=a(p),g=n(7),f=n(3),m=/Chrome/.test(navigator.userAgent),y=!m&&/AppleWebKit/.test(navigator.userAgent),v=function(){function e(t,n,a,i){o(this,e),this.epubcfi=new c.default,this.document=t,this.documentElement=this.document.documentElement,this.content=n||this.document.body,this.window=this.document.defaultView,this._size={width:0,height:0},this.sectionIndex=i||0,this.cfiBase=a||'',this.epubReadingSystem('epub.js',ePub.VERSION),this.listeners()}return s(e,[{key:'width',value:function(e){var t=this.content;return e&&(0,d.isNumber)(e)&&(e+='px'),e&&(t.style.width=e),this.window.getComputedStyle(t).width}},{key:'height',value:function(e){var t=this.content;return e&&(0,d.isNumber)(e)&&(e+='px'),e&&(t.style.height=e),this.window.getComputedStyle(t).height}},{key:'contentWidth',value:function(e){var t=this.content||this.document.body;return e&&(0,d.isNumber)(e)&&(e+='px'),e&&(t.style.width=e),this.window.getComputedStyle(t).width}},{key:'contentHeight',value:function(e){var t=this.content||this.document.body;return e&&(0,d.isNumber)(e)&&(e+='px'),e&&(t.style.height=e),this.window.getComputedStyle(t).height}},{key:'textWidth',value:function(){var e=this.document.createRange(),t=this.content||this.document.body,n=(0,d.borders)(t),a;return e.selectNodeContents(t),a=e.getBoundingClientRect().width,n&&n.width&&(a+=n.width),i(a)}},{key:'textHeight',value:function(){var e=this.document.createRange(),t=this.content||this.document.body,n=(0,d.borders)(t),a;return e.selectNodeContents(t),a=e.getBoundingClientRect().height,a&&n.height&&(a+=n.height),i(a)}},{key:'scrollWidth',value:function(){var e=this.documentElement.scrollWidth;return e}},{key:'scrollHeight',value:function(){var e=this.documentElement.scrollHeight;return e}},{key:'overflow',value:function(e){return e&&(this.documentElement.style.overflow=e),this.window.getComputedStyle(this.documentElement).overflow}},{key:'overflowX',value:function(e){return e&&(this.documentElement.style.overflowX=e),this.window.getComputedStyle(this.documentElement).overflowX}},{key:'overflowY',value:function(e){return e&&(this.documentElement.style.overflowY=e),this.window.getComputedStyle(this.documentElement).overflowY}},{key:'css',value:function(e,t,n){var a=this.content||this.document.body;return t&&a.style.setProperty(e,t,n?'important':''),this.window.getComputedStyle(a)[e]}},{key:'viewport',value:function(e){var t=this.document.querySelector('meta[name=\'viewport\']'),n={width:void 0,height:void 0,scale:void 0,minimum:void 0,maximum:void 0,scalable:void 0},a=[],i={};if(t&&t.hasAttribute('content')){var o=t.getAttribute('content'),s=o.match(/width\s*=\s*([^,]*)/),r=o.match(/height\s*=\s*([^,]*)/),l=o.match(/initial-scale\s*=\s*([^,]*)/),u=o.match(/minimum-scale\s*=\s*([^,]*)/),c=o.match(/maximum-scale\s*=\s*([^,]*)/),p=o.match(/user-scalable\s*=\s*([^,]*)/);s&&s.length&&'undefined'!=typeof s[1]&&(n.width=s[1]),r&&r.length&&'undefined'!=typeof r[1]&&(n.height=r[1]),l&&l.length&&'undefined'!=typeof l[1]&&(n.scale=l[1]),u&&u.length&&'undefined'!=typeof u[1]&&(n.minimum=u[1]),c&&c.length&&'undefined'!=typeof c[1]&&(n.maximum=c[1]),p&&p.length&&'undefined'!=typeof p[1]&&(n.scalable=p[1])}return i=(0,d.defaults)(e||{},n),e&&(i.width&&a.push('width='+i.width),i.height&&a.push('height='+i.height),i.scale&&a.push('initial-scale='+i.scale),'no'===i.scalable?(a.push('minimum-scale='+i.scale),a.push('maximum-scale='+i.scale),a.push('user-scalable='+i.scalable)):(i.scalable&&a.push('user-scalable='+i.scalable),i.minimum&&a.push('minimum-scale='+i.minimum),i.maximum&&a.push('minimum-scale='+i.maximum)),!t&&(t=this.document.createElement('meta'),t.setAttribute('name','viewport'),this.document.querySelector('head').appendChild(t)),t.setAttribute('content',a.join(', ')),this.window.scrollTo(0,0)),i}},{key:'expand',value:function(){this.emit(f.EVENTS.CONTENTS.EXPAND)}},{key:'listeners',value:function(){this.imageLoadListeners(),this.mediaQueryListeners(),this.addEventListeners(),this.addSelectionListeners(),this.resizeListeners(),this.linksHandler()}},{key:'removeListeners',value:function(){this.removeEventListeners(),this.removeSelectionListeners(),clearTimeout(this.expanding)}},{key:'resizeCheck',value:function(){var e=this.textWidth(),t=this.textHeight();(e!=this._size.width||t!=this._size.height)&&(this._size={width:e,height:t},this.onResize&&this.onResize(this._size),this.emit(f.EVENTS.CONTENTS.RESIZE,this._size))}},{key:'resizeListeners',value:function(){clearTimeout(this.expanding),requestAnimationFrame(this.resizeCheck.bind(this)),this.expanding=setTimeout(this.resizeListeners.bind(this),350)}},{key:'transitionListeners',value:function(){var e=this.content;e.style.transitionProperty='font, font-size, font-size-adjust, font-stretch, font-variation-settings, font-weight, width, height',e.style.transitionDuration='0.001ms',e.style.transitionTimingFunction='linear',e.style.transitionDelay='0',this.document.addEventListener('transitionend',this.resizeCheck.bind(this))}},{key:'mediaQueryListeners',value:function(){for(var e=this.document.styleSheets,t=function(e){e.matches&&!this._expanding&&setTimeout(this.expand.bind(this),1)}.bind(this),n=0;n<e.length;n+=1){var a;try{a=e[n].cssRules}catch(t){return}if(!a)return;for(var i=0;i<a.length;i+=1)if(a[i].media){var o=this.window.matchMedia(a[i].media.mediaText);o.addListener(t)}}}},{key:'resizeObservers',value:function(){var e=this;this.observer=new MutationObserver(function(){e.resizeCheck()});this.observer.observe(this.document,{attributes:!0,childList:!0,characterData:!0,subtree:!0})}},{key:'imageLoadListeners',value:function(){for(var e=this.document.querySelectorAll('img'),t=0,n;t<e.length;t++)n=e[t],'undefined'!=typeof n.naturalWidth&&0===n.naturalWidth&&(n.onload=this.expand.bind(this))}},{key:'fontLoadListeners',value:function(){this.document&&this.document.fonts&&this.document.fonts.ready.then(function(){this.resizeCheck()}.bind(this))}},{key:'root',value:function(){return this.document?this.document.documentElement:null}},{key:'locationOf',value:function(e,t){var n={left:0,top:0},a;if(!this.document)return n;if(this.epubcfi.isCfiString(e)){var i=new c.default(e).toRange(this.document,t);if(i)if(i.startContainer.nodeType===Node.ELEMENT_NODE)a=i.startContainer.getBoundingClientRect(),n.left=a.left,n.top=a.top;else if(y){var o=i.startContainer,s=new Range;try{o.nodeType===1?a=o.getBoundingClientRect():i.startOffset+2<o.length?(s.setStart(o,i.startOffset),s.setEnd(o,i.startOffset+2),a=s.getBoundingClientRect()):0<i.startOffset-2?(s.setStart(o,i.startOffset-2),s.setEnd(o,i.startOffset),a=s.getBoundingClientRect()):a=o.parentNode.getBoundingClientRect()}catch(t){console.error(t,t.stack)}}else a=i.getBoundingClientRect()}else if('string'==typeof e&&-1<e.indexOf('#')){var r=e.substring(e.indexOf('#')+1),l=this.document.getElementById(r);l&&(a=l.getBoundingClientRect())}return a&&(n.left=a.left,n.top=a.top),n}},{key:'addStylesheet',value:function(e){return new Promise(function(t){var n=!1,a;return this.document?(a=this.document.querySelector('link[href=\''+e+'\']'),a?void t(!0):void(a=this.document.createElement('link'),a.type='text/css',a.rel='stylesheet',a.href=e,a.onload=a.onreadystatechange=function(){n||this.readyState&&'complete'!=this.readyState||(n=!0,setTimeout(function(){t(!0)},1))},this.document.head.appendChild(a))):void t(!1)}.bind(this))}},{key:'addStylesheetRules',value:function(e){var t='epubjs-inserted-css',n,a;if(this.document&&e&&0!==e.length)if(n=this.document.getElementById('#'+t),n||(n=this.document.createElement('style'),n.id=t),this.document.head.appendChild(n),a=n.sheet,'[object Array]'===Object.prototype.toString.call(e))for(var o=0,i=e.length;o<i;o++){var s=1,r=e[o],l=e[o][0],d='';'[object Array]'===Object.prototype.toString.call(r[1][0])&&(r=r[1],s=0);for(var u=r.length,c;s<u;s++)c=r[s],d+=c[0]+':'+c[1]+(c[2]?' !important':'')+';\n';a.insertRule(l+'{'+d+'}',a.cssRules.length)}else{var p=Object.keys(e);p.forEach(function(t){var n=e[t];if(Array.isArray(n))n.forEach(function(e){var n=Object.keys(e),i=n.map(function(t){return t+':'+e[t]}).join(';');a.insertRule(t+'{'+i+'}',a.cssRules.length)});else{var i=Object.keys(n),o=i.map(function(e){return e+':'+n[e]}).join(';');a.insertRule(t+'{'+o+'}',a.cssRules.length)}})}}},{key:'addScript',value:function(e){return new Promise(function(t){var n=!1,a;return this.document?void(a=this.document.createElement('script'),a.type='text/javascript',a.async=!0,a.src=e,a.onload=a.onreadystatechange=function(){n||this.readyState&&'complete'!=this.readyState||(n=!0,setTimeout(function(){t(!0)},1))},this.document.head.appendChild(a)):void t(!1)}.bind(this))}},{key:'addClass',value:function(e){var t;this.document&&(t=this.content||this.document.body,t&&t.classList.add(e))}},{key:'removeClass',value:function(e){var t;this.document&&(t=this.content||this.document.body,t&&t.classList.remove(e))}},{key:'addEventListeners',value:function(){this.document&&f.DOM_EVENTS.forEach(function(e){this.document.addEventListener(e,this.triggerEvent.bind(this),!1)},this)}},{key:'removeEventListeners',value:function(){this.document&&f.DOM_EVENTS.forEach(function(e){this.document.removeEventListener(e,this.triggerEvent,!1)},this)}},{key:'triggerEvent',value:function(t){this.emit(t.type,t)}},{key:'addSelectionListeners',value:function(){this.document&&this.document.addEventListener('selectionchange',this.onSelectionChange.bind(this),!1)}},{key:'removeSelectionListeners',value:function(){this.document&&this.document.removeEventListener('selectionchange',this.onSelectionChange,!1)}},{key:'onSelectionChange',value:function(){this.selectionEndTimeout&&clearTimeout(this.selectionEndTimeout),this.selectionEndTimeout=setTimeout(function(){var e=this.window.getSelection();this.triggerSelectedEvent(e)}.bind(this),250)}},{key:'triggerSelectedEvent',value:function(e){var t,n;e&&0<e.rangeCount&&(t=e.getRangeAt(0),!t.collapsed&&(n=new c.default(t,this.cfiBase).toString(),this.emit(f.EVENTS.CONTENTS.SELECTED,n),this.emit(f.EVENTS.CONTENTS.SELECTED_RANGE,t)))}},{key:'range',value:function(e,t){var n=new c.default(e);return n.toRange(this.document,t)}},{key:'cfiFromRange',value:function(e,t){return new c.default(e,this.cfiBase,t).toString()}},{key:'cfiFromNode',value:function(e,t){return new c.default(e,this.cfiBase,t).toString()}},{key:'map',value:function(e){var t=new h.default(e);return t.section()}},{key:'size',value:function(e,t){var n={scale:1,scalable:'no'};this.layoutStyle('scrolling'),0<=e&&(this.width(e),n.width=e,this.css('padding','0 '+e/12+'px',!0)),0<=t&&(this.height(t),n.height=t),this.css('margin','0'),this.css('box-sizing','border-box'),this.viewport(n)}},{key:'columns',value:function(e,t,n,a){var i=(0,d.prefixed)('column-axis'),o=(0,d.prefixed)('column-gap'),s=(0,d.prefixed)('column-width'),r=(0,d.prefixed)('column-fill'),l=this.writingMode(),u=0===l.indexOf('vertical')?'vertical':'horizontal';this.layoutStyle('paginated'),'rtl'===this.content.dir&&this.direction('rtl'),this.width(e),this.height(t),this.viewport({width:e,height:t,scale:1,scalable:'no'}),this.css('overflow-y','hidden'),this.css('margin','0',!0),'vertical'==u?this.css('padding',a/2+'px 20px',!0):this.css('padding','20px '+a/2+'px',!0),this.css('box-sizing','border-box'),this.css('max-width','inherit'),this.css(i,'horizontal'),this.css(r,'auto'),this.css(o,a+'px'),this.css(s,n+'px')}},{key:'scaler',value:function(e,t,n){var a='';this.css('transform-origin','top left'),(0<=t||0<=n)&&(a=' translate('+(t||0)+'px, '+(n||0)+'px )'),this.css('transform','scale('+e+')'+a)}},{key:'fit',value:function(e,t){var n=this.viewport(),a=e/parseInt(n.width),i=t/parseInt(n.height),o=a<i?a:i,s=(t-n.height*o)/2;this.layoutStyle('paginated'),this.width(e),this.height(t),this.overflow('hidden'),this.scaler(o,0,s),this.css('background-color','transparent')}},{key:'direction',value:function(e){this.documentElement&&(this.documentElement.style.direction=e)}},{key:'mapPage',value:function(e,t,n,a,i){var o=new h.default(t,i);return o.page(this,e,n,a)}},{key:'linksHandler',value:function(){var e=this;(0,g.replaceLinks)(this.content,function(t){e.emit(f.EVENTS.CONTENTS.LINK_CLICKED,t)})}},{key:'writingMode',value:function(e){var t=(0,d.prefixed)('writing-mode');return e&&this.documentElement&&(this.documentElement.style[t]=e),this.window.getComputedStyle(this.documentElement)[t]||''}},{key:'layoutStyle',value:function(e){return e&&(this._layoutStyle=e,navigator.epubReadingSystem.layoutStyle=this._layoutStyle),this._layoutStyle||'paginated'}},{key:'epubReadingSystem',value:function(e,t){return navigator.epubReadingSystem={name:e,version:t,layoutStyle:this.layoutStyle(),hasFeature:function(e){return'dom-manipulation'===e||'layout-changes'===e||'touch-events'===e||'mouse-events'===e||'keyboard-events'===e||'spine-scripting'!==e&&!1}},navigator.epubReadingSystem}},{key:'destroy',value:function(){this.observer&&this.observer.disconnect(),this.document.removeEventListener('transitionend',this.resizeCheck),this.removeListeners()}}],[{key:'listenedEvents',get:function(){return f.DOM_EVENTS}}]),e}();(0,l.default)(v.prototype),t.default=v,e.exports=t['default']},function(e,t,n){'use strict';function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var r=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),l=n(2),d=i(l),u=n(0),c=n(19),p=i(c),h=n(12),g=i(h),f=n(56),m=i(f),y=n(66),v=i(y),b=n(3),k=function(){function e(t){o(this,e),this.name='default',this.View=t.view,this.request=t.request,this.renditionQueue=t.queue,this.q=new g.default(this),this.settings=(0,u.extend)(this.settings||{},{infinite:!0,hidden:!1,width:void 0,height:void 0,axis:void 0,flow:'scrolled',ignoreClass:''}),(0,u.extend)(this.settings,t.settings||{}),this.viewSettings={ignoreClass:this.settings.ignoreClass,axis:this.settings.axis,flow:this.settings.flow,layout:this.layout,method:this.settings.method,width:0,height:0,forceEvenPages:!0},this.rendered=!1}return r(e,[{key:'render',value:function(e,t){var n=e.tagName;n&&('body'==n.toLowerCase()||'html'==n.toLowerCase())&&(this.fullsize=!0),this.fullsize&&(this.settings.overflow='visible',this.overflow=this.settings.overflow),this.settings.size=t,this.stage=new m.default({width:t.width,height:t.height,overflow:this.overflow,hidden:this.settings.hidden,axis:this.settings.axis,fullsize:this.fullsize,direction:this.settings.direction}),this.stage.attachTo(e),this.container=this.stage.getContainer(),this.views=new v.default(this.container),this._bounds=this.bounds(),this._stageSize=this.stage.size(),this.viewSettings.width=this._stageSize.width,this.viewSettings.height=this._stageSize.height,this.stage.onResize(this.onResized.bind(this)),this.stage.onOrientationChange(this.onOrientationChange.bind(this)),this.addEventListeners(),this.layout&&this.updateLayout(),this.rendered=!0}},{key:'addEventListeners',value:function(){var e;window.addEventListener('unload',function(){this.destroy()}.bind(this)),e=this.fullsize?window:this.container,e.addEventListener('scroll',this.onScroll.bind(this))}},{key:'removeEventListeners',value:function(){var e;e=this.fullsize?window:this.container,e.removeEventListener('scroll',this.onScroll.bind(this))}},{key:'destroy',value:function(){clearTimeout(this.orientationTimeout),clearTimeout(this.resizeTimeout),clearTimeout(this.afterScrolled),this.clear(),this.removeEventListeners(),this.stage.destroy(),this.rendered=!1}},{key:'onOrientationChange',value:function(){var e=window,t=e.orientation;this.resize(),clearTimeout(this.orientationTimeout),this.orientationTimeout=setTimeout(function(){this.orientationTimeout=void 0,this.resize(),this.emit(b.EVENTS.MANAGERS.ORIENTATION_CHANGE,t)}.bind(this),500)}},{key:'onResized',value:function(){this.resize()}},{key:'resize',value:function(e,t){var n=this.stage.size(e,t);return this.winBounds=(0,u.windowBounds)(),this.orientationTimeout&&this.winBounds.width===this.winBounds.height?void(this._stageSize=void 0):void(this._stageSize&&this._stageSize.width===n.width&&this._stageSize.height===n.height||(this._stageSize=n,this._bounds=this.bounds(),this.clear(),this.viewSettings.width=this._stageSize.width,this.viewSettings.height=this._stageSize.height,this.updateLayout(),this.emit(b.EVENTS.MANAGERS.RESIZED,{width:this._stageSize.width,height:this._stageSize.height})))}},{key:'createView',value:function(e){return new this.View(e,this.viewSettings)}},{key:'display',value:function(e,t){var n=new u.defer,a=n.promise;(t===e.href||(0,u.isNumber)(t))&&(t=void 0);var i=this.views.find(e);if(i&&e){var o=i.offset();if('ltr'===this.settings.direction)this.scrollTo(o.left,o.top,!0);else{var s=i.width();this.scrollTo(o.left+s,o.top,!0)}if(t){var r=i.locationOf(t);this.moveTo(r)}return n.resolve(),a}return this.clear(),this.add(e).then(function(e){if(t){var n=e.locationOf(t);this.moveTo(n)}}.bind(this),function(e){n.reject(e)}).then(function(){var t;if('pre-paginated'===this.layout.name&&1<this.layout.divisor&&(t=e.next(),t))return this.add(t)}.bind(this)).then(function(){this.views.show(),n.resolve()}.bind(this)),a}},{key:'afterDisplayed',value:function(e){this.emit(b.EVENTS.MANAGERS.ADDED,e)}},{key:'afterResized',value:function(e){this.emit(b.EVENTS.MANAGERS.RESIZE,e.section)}},{key:'moveTo',value:function(e){var t=0,n=0;this.isPaginated?(t=s(e.left/this.layout.delta)*this.layout.delta,t+this.layout.delta>this.container.scrollWidth&&(t=this.container.scrollWidth-this.layout.delta)):n=e.top,this.scrollTo(t,n,!0)}},{key:'add',value:function(e){var t=this,n=this.createView(e);return this.views.append(n),n.onDisplayed=this.afterDisplayed.bind(this),n.onResize=this.afterResized.bind(this),n.on(b.EVENTS.VIEWS.AXIS,function(e){t.updateAxis(e)}),n.display(this.request)}},{key:'append',value:function(e){var t=this,n=this.createView(e);return this.views.append(n),n.onDisplayed=this.afterDisplayed.bind(this),n.onResize=this.afterResized.bind(this),n.on(b.EVENTS.VIEWS.AXIS,function(e){t.updateAxis(e)}),n.display(this.request)}},{key:'prepend',value:function(e){var t=this,n=this.createView(e);return n.on(b.EVENTS.VIEWS.RESIZED,function(e){t.counter(e)}),this.views.prepend(n),n.onDisplayed=this.afterDisplayed.bind(this),n.onResize=this.afterResized.bind(this),n.on(b.EVENTS.VIEWS.AXIS,function(e){t.updateAxis(e)}),n.display(this.request)}},{key:'counter',value:function(e){'vertical'===this.settings.axis?this.scrollBy(0,e.heightDelta,!0):this.scrollBy(e.widthDelta,0,!0)}},{key:'next',value:function(){var e=this.settings.direction,t,n;if(this.views.length){if(this.isPaginated&&'horizontal'===this.settings.axis&&(!e||'ltr'===e))this.scrollLeft=this.container.scrollLeft,n=this.container.scrollLeft+this.container.offsetWidth+this.layout.delta,n<=this.container.scrollWidth?this.scrollBy(this.layout.delta,0,!0):t=this.views.last().section.next();else if(this.isPaginated&&'horizontal'===this.settings.axis&&'rtl'===e)this.scrollLeft=this.container.scrollLeft,n=this.container.scrollLeft,0<n?this.scrollBy(this.layout.delta,0,!0):t=this.views.last().section.next();else if(this.isPaginated&&'vertical'===this.settings.axis){this.scrollTop=this.container.scrollTop;var a=this.container.scrollTop+this.container.offsetHeight;a<this.container.scrollHeight?this.scrollBy(0,this.layout.height,!0):t=this.views.last().section.next()}else t=this.views.last().section.next();return t?(this.clear(),this.append(t).then(function(){var e;if('pre-paginated'===this.layout.name&&1<this.layout.divisor&&(e=t.next(),e))return this.append(e)}.bind(this),function(e){displaying.reject(e)}).then(function(){this.views.show()}.bind(this))):void 0}}},{key:'prev',value:function(){var e=this.settings.direction,t,n;if(this.views.length){if(this.isPaginated&&'horizontal'===this.settings.axis&&(!e||'ltr'===e))this.scrollLeft=this.container.scrollLeft,n=this.container.scrollLeft,0<n?this.scrollBy(-this.layout.delta,0,!0):t=this.views.first().section.prev();else if(this.isPaginated&&'horizontal'===this.settings.axis&&'rtl'===e)this.scrollLeft=this.container.scrollLeft,n=this.container.scrollLeft+this.container.offsetWidth+this.layout.delta,n<=this.container.scrollWidth?this.scrollBy(-this.layout.delta,0,!0):t=this.views.first().section.prev();else if(this.isPaginated&&'vertical'===this.settings.axis){this.scrollTop=this.container.scrollTop;var a=this.container.scrollTop;0<a?this.scrollBy(0,-this.layout.height,!0):t=this.views.first().section.prev()}else t=this.views.first().section.prev();return t?(this.clear(),this.prepend(t).then(function(){var e;if('pre-paginated'===this.layout.name&&1<this.layout.divisor&&(e=t.prev(),e))return this.prepend(e)}.bind(this),function(e){displaying.reject(e)}).then(function(){this.isPaginated&&'horizontal'===this.settings.axis&&('rtl'===this.settings.direction?this.scrollTo(0,0,!0):this.scrollTo(this.container.scrollWidth-this.layout.delta,0,!0)),this.views.show()}.bind(this))):void 0}}},{key:'current',value:function(){var e=this.visible();return e.length?e[e.length-1]:null}},{key:'clear',value:function(){this.views&&(this.views.hide(),this.scrollTo(0,0,!0),this.views.clear())}},{key:'currentLocation',value:function(){return this.location='vertical'===this.settings.axis?this.scrolledLocation():this.paginatedLocation(),this.location}},{key:'scrolledLocation',value:function(){var e=this,t=this.visible(),n=this.container.getBoundingClientRect(),o=n.height<window.innerHeight?n.height:window.innerHeight,s=0,r=0;this.fullsize&&(s=window.scrollY);var i=t.map(function(t){var l=t.section,d=l.index,u=l.href,c=t.position(),p=t.height(),h=s+n.top-c.top+r,g=h+o-r;g>p&&(g=p,r=g-h);var f=e.layout.count(p,o).pages,m=a(h/o),y=[],v=a(g/o);y=[];for(var b=m,i;b<=v;b++)i=b+1,y.push(i);var k=e.mapping.page(t.contents,t.section.cfiBase,h,g);return{index:d,href:u,pages:y,totalPages:f,mapping:k}});return i}},{key:'paginatedLocation',value:function(){var e=this,t=this.visible(),n=this.container.getBoundingClientRect(),a=0,o=0;this.fullsize&&(a=window.scrollX);var i=t.map(function(t){var r=t.section,l=r.index,d=r.href,u=t.offset().left,c=t.position().left,p=t.width(),h=a+n.left-c+o,g=h+e.layout.width-o,f=e.mapping.page(t.contents,t.section.cfiBase,h,g),m=e.layout.count(p).pages,y=s(h/e.layout.pageWidth),v=[],b=s(g/e.layout.pageWidth);if(0>y&&(y=0,++b),'rtl'===e.settings.direction){var k=y;y=m-b,b=m-k}for(var x=y+1,i;x<=b;x++)i=x,v.push(i);return{index:l,href:d,pages:v,totalPages:m,mapping:f}});return i}},{key:'isVisible',value:function(e,t,n,a){var i=e.position(),o=a||this.bounds();return'horizontal'===this.settings.axis&&i.right>o.left-t&&i.left<o.right+n||'vertical'===this.settings.axis&&i.bottom>o.top-t&&i.top<o.bottom+n}},{key:'visible',value:function(){for(var e=this.bounds(),t=this.views.displayed(),n=t.length,a=[],o=0,i,s;o<n;o++)s=t[o],i=this.isVisible(s,0,0,e),!0===i&&a.push(s);return a}},{key:'scrollBy',value:function(e,t,n){var a='rtl'===this.settings.direction?-1:1;n&&(this.ignore=!0),this.fullsize?window.scrollBy(e*a,t*a):(e&&(this.container.scrollLeft+=e*a),t&&(this.container.scrollTop+=t)),this.scrolled=!0}},{key:'scrollTo',value:function(e,t,n){n&&(this.ignore=!0),this.fullsize?window.scrollTo(e,t):(this.container.scrollLeft=e,this.container.scrollTop=t),this.scrolled=!0}},{key:'onScroll',value:function(){var e,t;this.fullsize?(e=window.scrollY,t=window.scrollX):(e=this.container.scrollTop,t=this.container.scrollLeft),this.scrollTop=e,this.scrollLeft=t,this.ignore?this.ignore=!1:(this.emit(b.EVENTS.MANAGERS.SCROLL,{top:e,left:t}),clearTimeout(this.afterScrolled),this.afterScrolled=setTimeout(function(){this.emit(b.EVENTS.MANAGERS.SCROLLED,{top:this.scrollTop,left:this.scrollLeft})}.bind(this),20))}},{key:'bounds',value:function(){var e;return e=this.stage.bounds(),e}},{key:'applyLayout',value:function(e){this.layout=e,this.updateLayout()}},{key:'updateLayout',value:function(){this.stage&&(this._stageSize=this.stage.size(),this.isPaginated?(this.layout.calculate(this._stageSize.width,this._stageSize.height,this.settings.gap),this.settings.offset=this.layout.delta):this.layout.calculate(this._stageSize.width,this._stageSize.height),this.viewSettings.width=this.layout.width,this.viewSettings.height=this.layout.height,this.setLayout(this.layout))}},{key:'setLayout',value:function(e){this.viewSettings.layout=e,this.mapping=new p.default(e.props,this.settings.direction,this.settings.axis),this.views&&this.views.forEach(function(t){t&&t.setLayout(e)})}},{key:'updateAxis',value:function(e,t){this.isPaginated||(e='vertical'),(t||e!==this.settings.axis)&&(this.settings.axis=e,this.stage&&this.stage.axis(e),this.viewSettings.axis=e,this.mapping&&(this.mapping=new p.default(this.layout.props,this.settings.direction,this.settings.axis)),this.layout&&('vertical'===e?this.layout.spread('none'):this.layout.spread(this.layout.settings.spread)))}},{key:'updateFlow',value:function(e){var t='paginated'===e||'auto'===e;this.isPaginated=t,('scrolled-doc'===e||'scrolled-continuous'===e||'scrolled'===e)&&this.updateAxis('vertical'),this.viewSettings.flow=e,this.overflow=this.settings.overflow?this.settings.overflow:t?'hidden':'auto',this.updateLayout()}},{key:'getContents',value:function(){var e=[];return this.views?(this.views.forEach(function(t){var n=t&&t.contents;n&&e.push(n)}),e):e}},{key:'direction',value:function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:'ltr';this.settings.direction=e,this.stage&&this.stage.direction(e),this.viewSettings.direction=e,this.updateLayout()}},{key:'isRendered',value:function(){return this.rendered}}]),e}();(0,d.default)(k.prototype),t.default=k,e.exports=t['default']},function(e){e.exports=function(e){var t=typeof e;return null!=e&&('object'==t||'function'==t)}},function(t){t.exports=e},function(e){'use strict';var t={application:{ecmascript:['es','ecma'],javascript:'js',ogg:'ogx',pdf:'pdf',postscript:['ps','ai','eps','epsi','epsf','eps2','eps3'],"rdf+xml":'rdf',smil:['smi','smil'],"xhtml+xml":['xhtml','xht'],xml:['xml','xsl','xsd','opf','ncx'],zip:'zip',"x-httpd-eruby":'rhtml',"x-latex":'latex',"x-maker":['frm','maker','frame','fm','fb','book','fbdoc'],"x-object":'o',"x-shockwave-flash":['swf','swfl'],"x-silverlight":'scr',"epub+zip":'epub',"font-tdpfr":'pfr',"inkml+xml":['ink','inkml'],json:'json',"jsonml+json":'jsonml',"mathml+xml":'mathml',"metalink+xml":'metalink',mp4:'mp4s',"omdoc+xml":'omdoc',oxps:'oxps',"vnd.amazon.ebook":'azw',widget:'wgt',"x-dtbook+xml":'dtb',"x-dtbresource+xml":'res',"x-font-bdf":'bdf',"x-font-ghostscript":'gsf',"x-font-linux-psf":'psf',"x-font-otf":'otf',"x-font-pcf":'pcf',"x-font-snf":'snf',"x-font-ttf":['ttf','ttc'],"x-font-type1":['pfa','pfb','pfm','afm'],"x-font-woff":'woff',"x-mobipocket-ebook":['prc','mobi'],"x-mspublisher":'pub',"x-nzb":'nzb',"x-tgif":'obj',"xaml+xml":'xaml',"xml-dtd":'dtd',"xproc+xml":'xpl',"xslt+xml":'xslt',"internet-property-stream":'acx',"x-compress":'z',"x-compressed":'tgz',"x-gzip":'gz'},audio:{flac:'flac',midi:['mid','midi','kar','rmi'],mpeg:['mpga','mpega','mp2','mp3','m4a','mp2a','m2a','m3a'],mpegurl:'m3u',ogg:['oga','ogg','spx'],"x-aiff":['aif','aiff','aifc'],"x-ms-wma":'wma',"x-wav":'wav',adpcm:'adp',mp4:'mp4a',webm:'weba',"x-aac":'aac',"x-caf":'caf',"x-matroska":'mka',"x-pn-realaudio-plugin":'rmp',xm:'xm',mid:['mid','rmi']},image:{gif:'gif',ief:'ief',jpeg:['jpeg','jpg','jpe'],pcx:'pcx',png:'png',"svg+xml":['svg','svgz'],tiff:['tiff','tif'],"x-icon":'ico',bmp:'bmp',webp:'webp',"x-pict":['pic','pct'],"x-tga":'tga',"cis-cod":'cod'},text:{"cache-manifest":['manifest','appcache'],css:'css',csv:'csv',html:['html','htm','shtml','stm'],mathml:'mml',plain:['txt','text','brf','conf','def','list','log','in','bas'],richtext:'rtx',"tab-separated-values":'tsv',"x-bibtex":'bib'},video:{mpeg:['mpeg','mpg','mpe','m1v','m2v','mp2','mpa','mpv2'],mp4:['mp4','mp4v','mpg4'],quicktime:['qt','mov'],ogg:'ogv',"vnd.mpegurl":['mxu','m4u'],"x-flv":'flv',"x-la-asf":['lsf','lsx'],"x-mng":'mng',"x-ms-asf":['asf','asx','asr'],"x-ms-wm":'wm',"x-ms-wmv":'wmv',"x-ms-wmx":'wmx',"x-ms-wvx":'wvx',"x-msvideo":'avi',"x-sgi-movie":'movie',"x-matroska":['mpv','mkv','mk3d','mks'],"3gpp2":'3g2',h261:'h261',h263:'h263',h264:'h264',jpeg:'jpgv',jpm:['jpm','jpgm'],mj2:['mj2','mjp2'],"vnd.ms-playready.media.pyv":'pyv',"vnd.uvvu.mp4":['uvu','uvvu'],"vnd.vivo":'viv',webm:'webm',"x-f4v":'f4v',"x-m4v":'m4v',"x-ms-vob":'vob',"x-smv":'smv'}},n=function(){var e={},n,a,i,o;for(n in t)if(t.hasOwnProperty(n))for(a in t[n])if(t[n].hasOwnProperty(a))if(i=t[n][a],'string'==typeof i)e[i]=n+'/'+a;else for(o=0;o<i.length;o++)e[i[o]]=n+'/'+a;return e}();e.exports={lookup:function(e){return e&&n[e.split('.').pop().toLowerCase()]||'text/plain'}}},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o='function'==typeof Symbol&&'symbol'==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&'function'==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?'symbol':typeof e},s=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),r=n(2),l=a(r),d=n(0),u=n(10),c=a(u),p=n(1),h=a(p),g=n(12),f=a(g),m=n(50),y=a(m),v=n(51),b=a(v),k=n(13),x=a(k),E=n(52),_=a(E),w=n(3),S=n(20),C=a(S),T=n(14),N=a(T),R=n(24),L=a(R),P=function(){function e(t,n){i(this,e),this.settings=(0,d.extend)(this.settings||{},{width:null,height:null,ignoreClass:'',manager:'default',view:'iframe',flow:null,layout:null,spread:null,minSpreadWidth:800,stylesheet:null,script:null}),(0,d.extend)(this.settings,n),'object'===o(this.settings.manager)&&(this.manager=this.settings.manager),this.book=t,this.hooks={},this.hooks.display=new c.default(this),this.hooks.serialize=new c.default(this),this.hooks.content=new c.default(this),this.hooks.unloaded=new c.default(this),this.hooks.layout=new c.default(this),this.hooks.render=new c.default(this),this.hooks.show=new c.default(this),this.hooks.content.register(this.handleLinks.bind(this)),this.hooks.content.register(this.passEvents.bind(this)),this.hooks.content.register(this.adjustImages.bind(this)),this.book.spine.hooks.content.register(this.injectIdentifier.bind(this)),this.settings.stylesheet&&this.book.spine.hooks.content.register(this.injectStylesheet.bind(this)),this.settings.script&&this.book.spine.hooks.content.register(this.injectScript.bind(this)),this.themes=new b.default(this),this.annotations=new _.default(this),this.epubcfi=new h.default,this.q=new f.default(this),this.location=void 0,this.q.enqueue(this.book.opened),this.starting=new d.defer,this.started=this.starting.promise,this.q.enqueue(this.start)}return s(e,[{key:'setManager',value:function(e){this.manager=e}},{key:'requireManager',value:function(e){var t;return t='string'==typeof e&&'default'===e?N.default:'string'==typeof e&&'continuous'===e?L.default:e,t}},{key:'requireView',value:function(e){var t;return t='string'==typeof e&&'iframe'===e?C.default:e,t}},{key:'start',value:function(){this.manager||(this.ViewManager=this.requireManager(this.settings.manager),this.View=this.requireView(this.settings.view),this.manager=new this.ViewManager({view:this.View,queue:this.q,request:this.book.load.bind(this.book),settings:this.settings})),this.direction(this.book.package.metadata.direction),this.settings.globalLayoutProperties=this.determineLayoutProperties(this.book.package.metadata),this.flow(this.settings.globalLayoutProperties.flow),this.layout(this.settings.globalLayoutProperties),this.manager.on(w.EVENTS.MANAGERS.ADDED,this.afterDisplayed.bind(this)),this.manager.on(w.EVENTS.MANAGERS.REMOVED,this.afterRemoved.bind(this)),this.manager.on(w.EVENTS.MANAGERS.RESIZED,this.onResized.bind(this)),this.manager.on(w.EVENTS.MANAGERS.ORIENTATION_CHANGE,this.onOrientationChange.bind(this)),this.manager.on(w.EVENTS.MANAGERS.SCROLLED,this.reportLocation.bind(this)),this.emit(w.EVENTS.RENDITION.STARTED),this.starting.resolve()}},{key:'attachTo',value:function(e){return this.q.enqueue(function(){this.manager.render(e,{width:this.settings.width,height:this.settings.height}),this.emit(w.EVENTS.RENDITION.ATTACHED)}.bind(this))}},{key:'display',value:function(e){return this.displaying&&this.displaying.resolve(),this.q.enqueue(this._display,e)}},{key:'_display',value:function(e){var t=this;if(this.book){var n=this.epubcfi.isCfiString(e),a=new d.defer,i=a.promise,o;return(this.displaying=a,this.book.locations.length()&&((0,d.isFloat)(e)||'1.0'===e)&&(e=this.book.locations.cfiFromPercentage(parseFloat(e))),o=this.book.spine.get(e),!o)?(a.reject(new Error('No Section Found')),i):(this.manager.display(o,e).then(function(){a.resolve(o),t.displaying=void 0,t.emit(w.EVENTS.RENDITION.DISPLAYED,o),t.reportLocation()},function(e){t.emit(w.EVENTS.RENDITION.DISPLAY_ERROR,e)}),i)}}},{key:'afterDisplayed',value:function(e){var t=this;e.on(w.EVENTS.VIEWS.MARK_CLICKED,function(n,a){return t.triggerMarkEvent(n,a,e)}),this.hooks.render.trigger(e,this).then(function(){e.contents?t.hooks.content.trigger(e.contents,t).then(function(){t.emit(w.EVENTS.RENDITION.RENDERED,e.section,e)}):t.emit(w.EVENTS.RENDITION.RENDERED,e.section,e)})}},{key:'afterRemoved',value:function(e){var t=this;this.hooks.unloaded.trigger(e,this).then(function(){t.emit(w.EVENTS.RENDITION.REMOVED,e.section,e)})}},{key:'onResized',value:function(e){this.emit(w.EVENTS.RENDITION.RESIZED,{width:e.width,height:e.height}),this.location&&this.location.start&&this.display(this.location.start.cfi)}},{key:'onOrientationChange',value:function(e){this.emit(w.EVENTS.RENDITION.ORIENTATION_CHANGE,e)}},{key:'moveTo',value:function(e){this.manager.moveTo(e)}},{key:'resize',value:function(e,t){e&&(this.settings.width=e),t&&(this.settings.height=t),this.manager.resize(e,t)}},{key:'clear',value:function(){this.manager.clear()}},{key:'next',value:function(){return this.q.enqueue(this.manager.next.bind(this.manager)).then(this.reportLocation.bind(this))}},{key:'prev',value:function(){return this.q.enqueue(this.manager.prev.bind(this.manager)).then(this.reportLocation.bind(this))}},{key:'determineLayoutProperties',value:function(e){var t=this.settings.layout||e.layout||'reflowable',n=this.settings.spread||e.spread||'auto',a=this.settings.orientation||e.orientation||'auto',i=this.settings.flow||e.flow||'auto',o=e.viewport||'',s=this.settings.minSpreadWidth||e.minSpreadWidth||800,r=this.settings.direction||e.direction||'ltr',l;return(0===this.settings.width||0<this.settings.width)&&(0===this.settings.height||0<this.settings.height),l={layout:t,spread:n,orientation:a,flow:i,viewport:o,minSpreadWidth:s,direction:r},l}},{key:'flow',value:function(e){var t=e;('scrolled'===e||'scrolled-doc'===e||'scrolled-continuous'===e)&&(t='scrolled'),('auto'===e||'paginated'===e)&&(t='paginated'),this.settings.flow=e,this._layout&&this._layout.flow(t),this.manager&&this._layout&&this.manager.applyLayout(this._layout),this.manager&&this.manager.updateFlow(t),this.manager&&this.manager.isRendered()&&this.location&&(this.manager.clear(),this.display(this.location.start.cfi))}},{key:'layout',value:function(e){var t=this;return e&&(this._layout=new y.default(e),this._layout.spread(e.spread,this.settings.minSpreadWidth),this._layout.on(w.EVENTS.LAYOUT.UPDATED,function(e,n){t.emit(w.EVENTS.RENDITION.LAYOUT,e,n)})),this.manager&&this._layout&&this.manager.applyLayout(this._layout),this._layout}},{key:'spread',value:function(e,t){this._layout.spread(e,t),this.manager.isRendered()&&this.manager.updateLayout()}},{key:'direction',value:function(e){this.settings.direction=e||'ltr',this.manager&&this.manager.direction(this.settings.direction),this.manager&&this.manager.isRendered()&&this.location&&(this.manager.clear(),this.display(this.location.start.cfi))}},{key:'reportLocation',value:function(){return this.q.enqueue(function(){requestAnimationFrame(function(){var e=this.manager.currentLocation();if(e&&e.then&&'function'==typeof e.then)e.then(function(e){var t=this.located(e);t&&t.start&&t.end&&(this.location=t,this.emit(w.EVENTS.RENDITION.LOCATION_CHANGED,{index:this.location.start.index,href:this.location.start.href,start:this.location.start.cfi,end:this.location.end.cfi,percentage:this.location.start.percentage}),this.emit(w.EVENTS.RENDITION.RELOCATED,this.location))}.bind(this));else if(e){var t=this.located(e);if(!t||!t.start||!t.end)return;this.location=t,this.emit(w.EVENTS.RENDITION.LOCATION_CHANGED,{index:this.location.start.index,href:this.location.start.href,start:this.location.start.cfi,end:this.location.end.cfi,percentage:this.location.start.percentage}),this.emit(w.EVENTS.RENDITION.RELOCATED,this.location)}}.bind(this))}.bind(this))}},{key:'currentLocation',value:function(){var e=this.manager.currentLocation();if(e&&e.then&&'function'==typeof e.then)e.then(function(e){var t=this.located(e);return t}.bind(this));else if(e){var t=this.located(e);return t}}},{key:'located',value:function(e){if(!e.length)return{};var t=e[0],n=e[e.length-1],a={start:{index:t.index,href:t.href,cfi:t.mapping.start,displayed:{page:t.pages[0]||1,total:t.totalPages}},end:{index:n.index,href:n.href,cfi:n.mapping.end,displayed:{page:n.pages[n.pages.length-1]||1,total:n.totalPages}}},i=this.book.locations.locationFromCfi(t.mapping.start),o=this.book.locations.locationFromCfi(n.mapping.end);null!=i&&(a.start.location=i,a.start.percentage=this.book.locations.percentageFromLocation(i)),null!=o&&(a.end.location=o,a.end.percentage=this.book.locations.percentageFromLocation(o));var s=this.book.pageList.pageFromCfi(t.mapping.start),r=this.book.pageList.pageFromCfi(n.mapping.end);return-1!=s&&(a.start.page=s),-1!=r&&(a.end.page=r),n.index===this.book.spine.last().index&&a.end.displayed.page>=a.end.displayed.total&&(a.atEnd=!0),t.index===this.book.spine.first().index&&1===a.start.displayed.page&&(a.atStart=!0),a}},{key:'destroy',value:function(){this.manager&&this.manager.destroy(),this.book=void 0}},{key:'passEvents',value:function(t){var n=this,e=x.default.listenedEvents;e.forEach(function(a){t.on(a,function(e){return n.triggerViewEvent(e,t)})}),t.on(w.EVENTS.CONTENTS.SELECTED,function(a){return n.triggerSelectedEvent(a,t)})}},{key:'triggerViewEvent',value:function(t,e){this.emit(t.type,t,e)}},{key:'triggerSelectedEvent',value:function(e,t){this.emit(w.EVENTS.RENDITION.SELECTED,e,t)}},{key:'triggerMarkEvent',value:function(e,t,n){this.emit(w.EVENTS.RENDITION.MARK_CLICKED,e,t,n)}},{key:'getRange',value:function(e,t){var n=new h.default(e),a=this.manager.visible().filter(function(e){if(n.spinePos===e.index)return!0});if(a.length)return a[0].contents.range(n,t)}},{key:'adjustImages',value:function(e){return'pre-paginated'===this._layout.name?new Promise(function(e){e()}):(e.addStylesheetRules({img:{"max-width":(this._layout.columnWidth?this._layout.columnWidth+'px':'100%')+'!important',"max-height":(this._layout.height?0.6*this._layout.height+'px':'60%')+'!important',"object-fit":'contain',"page-break-inside":'avoid'},svg:{"max-width":(this._layout.columnWidth?this._layout.columnWidth+'px':'100%')+'!important',"max-height":(this._layout.height?0.6*this._layout.height+'px':'60%')+'!important',"page-break-inside":'avoid'}}),new Promise(function(e){setTimeout(function(){e()},1)}))}},{key:'getContents',value:function(){return this.manager?this.manager.getContents():[]}},{key:'views',value:function(){var e=this.manager?this.manager.views:void 0;return e||[]}},{key:'handleLinks',value:function(e){var t=this;e&&e.on(w.EVENTS.CONTENTS.LINK_CLICKED,function(e){var n=t.book.path.relative(e);t.display(n)})}},{key:'injectStylesheet',value:function(e){var t=e.createElement('link');t.setAttribute('type','text/css'),t.setAttribute('rel','stylesheet'),t.setAttribute('href',this.settings.stylesheet),e.getElementsByTagName('head')[0].appendChild(t)}},{key:'injectScript',value:function(e){var t=e.createElement('script');t.setAttribute('type','text/javascript'),t.setAttribute('src',this.settings.script),t.textContent=' ',e.getElementsByTagName('head')[0].appendChild(t)}},{key:'injectIdentifier',value:function(e){var t=this.book.package.metadata.identifier,n=e.createElement('meta');n.setAttribute('name','dc.relation.ispartof'),t&&n.setAttribute('content',t),e.getElementsByTagName('head')[0].appendChild(n)}}]),e}();(0,l.default)(P.prototype),t.default=P,e.exports=t['default']},function(e,t,n){'use strict';function o(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var s=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),r=n(1),l=function(e){return e&&e.__esModule?e:{default:e}}(r),d=function(){function e(t,n,a,i){o(this,e),this.layout=t,this.horizontal='horizontal'===a,this.direction=n||'ltr',this._dev=i}return s(e,[{key:'section',value:function(e){var t=this.findRanges(e),n=this.rangeListToCfiList(e.section.cfiBase,t);return n}},{key:'page',value:function(e,t,n,a){var i=e&&e.document&&e.document.body,o;if(i){if(o=this.rangePairToCfiPair(t,{start:this.findStart(i,n,a),end:this.findEnd(i,n,a)}),!0===this._dev){var s=e.document,d=new l.default(o.start).toRange(s),u=new l.default(o.end).toRange(s),c=s.defaultView.getSelection(),p=s.createRange();c.removeAllRanges(),p.setStart(d.startContainer,d.startOffset),p.setEnd(u.endContainer,u.endOffset),c.addRange(p)}return o}}},{key:'walk',value:function(e,t){if(!(e&&e.nodeType===Node.TEXT_NODE)){var n={acceptNode:function(e){return 0<e.data.trim().length?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_REJECT}},a=n.acceptNode;a.acceptNode=n.acceptNode;for(var i=document.createTreeWalker(e,NodeFilter.SHOW_TEXT,a,!1),o,s;(o=i.nextNode())&&(s=t(o),!s););return s}}},{key:'findRanges',value:function(e){for(var t=[],n=e.contents.scrollWidth(),o=a(n/this.layout.spreadWidth),s=o*this.layout.divisor,r=this.layout.columnWidth,l=this.layout.gap,d=0,i,u;d<s.pages;d++)i=(r+l)*d,u=r*(d+1)+l*d,t.push({start:this.findStart(e.document.body,i,u),end:this.findEnd(e.document.body,i,u)});return t}},{key:'findStart',value:function(e,t,n){for(var a=this,i=[e],o=e,s,r;i.length;)if(s=i.shift(),r=this.walk(s,function(e){var s,r,l,d,u;if(u=a.getBounds(e),a.horizontal&&'ltr'===a.direction){if(s=a.horizontal?u.left:u.top,r=a.horizontal?u.right:u.bottom,s>=t&&s<=n)return e;if(r>t)return e;o=e,i.push(e)}else if(a.horizontal&&'rtl'===a.direction){if(s=u.left,r=u.right,r<=n&&r>=t)return e;if(s<n)return e;o=e,i.push(e)}else{if(l=u.top,d=u.bottom,l>=t&&l<=n)return e;if(d>t)return e;o=e,i.push(e)}}),r)return this.findTextStartRange(r,t,n);return this.findTextStartRange(o,t,n)}},{key:'findEnd',value:function(e,t,n){for(var a=this,o=[e],s=e,r,l;o.length;)if(r=o.shift(),l=this.walk(r,function(e){var r,l,d,u,c;if(c=a.getBounds(e),a.horizontal&&'ltr'===a.direction){if(r=i(c.left),l=i(c.right),r>n&&s)return s;if(l>n)return e;s=e,o.push(e)}else if(a.horizontal&&'rtl'===a.direction){if(r=i(a.horizontal?c.left:c.top),l=i(a.horizontal?c.right:c.bottom),l<t&&s)return s;if(r<t)return e;s=e,o.push(e)}else{if(d=i(c.top),u=i(c.bottom),d>n&&s)return s;if(u>n)return e;s=e,o.push(e)}}),l)return this.findTextEndRange(l,t,n);return this.findTextEndRange(s,t,n)}},{key:'findTextStartRange',value:function(e,t,n){for(var a=this.splitTextNodeIntoRanges(e),o=0,i,s,r,l,d;o<a.length;o++)if(i=a[o],s=i.getBoundingClientRect(),this.horizontal&&'ltr'===this.direction){if(r=s.left,r>=t)return i;}else if(this.horizontal&&'rtl'===this.direction){if(d=s.right,d<=n)return i;}else if(l=s.top,l>=t)return i;return a[0]}},{key:'findTextEndRange',value:function(e,t,n){for(var a=this.splitTextNodeIntoRanges(e),o=0,i,s,r,l,d,u,c;o<a.length;o++){if(s=a[o],r=s.getBoundingClientRect(),this.horizontal&&'ltr'===this.direction){if(l=r.left,d=r.right,l>n&&i)return i;if(d>n)return s}else if(this.horizontal&&'rtl'===this.direction){if(l=r.left,d=r.right,d<t&&i)return i;if(l<t)return s}else{if(u=r.top,c=r.bottom,u>n&&i)return i;if(c>n)return s}i=s}return a[a.length-1]}},{key:'splitTextNodeIntoRanges',value:function(e,t){var n=[],a=e.textContent||'',i=a.trim(),o=e.ownerDocument,s=t||' ',r=i.indexOf(s),l;if(-1===r||e.nodeType!=Node.TEXT_NODE)return l=o.createRange(),l.selectNodeContents(e),[l];for(l=o.createRange(),l.setStart(e,0),l.setEnd(e,r),n.push(l),l=!1;-1!=r;)r=i.indexOf(s,r+1),0<r&&(l&&(l.setEnd(e,r),n.push(l)),l=o.createRange(),l.setStart(e,r+1));return l&&(l.setEnd(e,i.length),n.push(l)),n}},{key:'rangePairToCfiPair',value:function(e,t){var n=t.start,a=t.end;n.collapse(!0),a.collapse(!1);var i=new l.default(n,e).toString(),o=new l.default(a,e).toString();return{start:i,end:o}}},{key:'rangeListToCfiList',value:function(e,t){for(var n=[],a=0,i;a<t.length;a++)i=this.rangePairToCfiPair(e,t[a]),n.push(i);return n}},{key:'getBounds',value:function(e){var t;if(e.nodeType==Node.TEXT_NODE){var n=document.createRange();n.selectNodeContents(e),t=n.getBoundingClientRect()}else t=e.getBoundingClientRect();return t}},{key:'axis',value:function(e){return e&&(this.horizontal='horizontal'===e),this.horizontal}}]),e}();t.default=d,e.exports=t['default']},function(e,t,n){'use strict';function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var s=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),r=n(2),l=i(r),d=n(0),u=n(1),c=i(u),p=n(13),h=i(p),g=n(3),f=n(53),m=function(){function e(t,n){o(this,e),this.settings=(0,d.extend)({ignoreClass:'',axis:n.layout&&'scrolled'===n.layout.props.flow?'vertical':'horizontal',direction:void 0,width:0,height:0,layout:void 0,globalLayoutProperties:{},method:void 0},n||{}),this.id='epubjs-view-'+(0,d.uuid)(),this.section=t,this.index=t.index,this.element=this.container(this.settings.axis),this.added=!1,this.displayed=!1,this.rendered=!1,this.fixedWidth=0,this.fixedHeight=0,this.epubcfi=new c.default,this.layout=this.settings.layout,this.pane=void 0,this.highlights={},this.underlines={},this.marks={}}return s(e,[{key:'container',value:function(e){var t=document.createElement('div');return t.classList.add('epub-view'),t.style.height='0px',t.style.width='0px',t.style.overflow='hidden',t.style.position='relative',t.style.display='block',t.style.flex=e&&'horizontal'==e?'none':'initial',t}},{key:'create',value:function(){return this.iframe?this.iframe:(this.element||(this.element=this.createContainer()),this.iframe=document.createElement('iframe'),this.iframe.id=this.id,this.iframe.scrolling='no',this.iframe.style.overflow='hidden',this.iframe.seamless='seamless',this.iframe.style.border='none',this.iframe.setAttribute('enable-annotation','true'),this.resizing=!0,this.element.style.visibility='hidden',this.iframe.style.visibility='hidden',this.iframe.style.width='0',this.iframe.style.height='0',this._width=0,this._height=0,this.element.setAttribute('ref',this.index),this.element.appendChild(this.iframe),this.added=!0,this.elementBounds=(0,d.bounds)(this.element),this.supportsSrcdoc=!!('srcdoc'in this.iframe),this.settings.method||(this.settings.method=this.supportsSrcdoc?'srcdoc':'write'),this.iframe)}},{key:'render',value:function(e){return this.create(),this.size(),this.sectionRender||(this.sectionRender=this.section.render(e)),this.sectionRender.then(function(e){return this.load(e)}.bind(this)).then(function(){var e=this;this.layout.format(this.contents);var t=this.contents.writingMode(),n=0===t.indexOf('vertical')?'vertical':'horizontal';return this.setAxis(n),this.emit(g.EVENTS.VIEWS.AXIS,n),this.addListeners(),new Promise(function(t){e.expand(),t()})}.bind(this),function(t){return this.emit(g.EVENTS.VIEWS.LOAD_ERROR,t),new Promise(function(e,n){n(t)})}.bind(this)).then(function(){this.emit(g.EVENTS.VIEWS.RENDERED,this.section)}.bind(this))}},{key:'reset',value:function(){this.iframe&&(this.iframe.style.width='0',this.iframe.style.height='0',this._width=0,this._height=0,this._textWidth=void 0,this._contentWidth=void 0,this._textHeight=void 0,this._contentHeight=void 0),this._needsReframe=!0}},{key:'size',value:function(e,t){var n=e||this.settings.width,a=t||this.settings.height;'pre-paginated'===this.layout.name?this.lock('both',n,a):'horizontal'===this.settings.axis?this.lock('height',n,a):this.lock('width',n,a),this.settings.width=n,this.settings.height=a}},{key:'lock',value:function(e,t,n){var a=(0,d.borders)(this.element),i;i=this.iframe?(0,d.borders)(this.iframe):{width:0,height:0},'width'==e&&(0,d.isNumber)(t)&&(this.lockedWidth=t-a.width-i.width),'height'==e&&(0,d.isNumber)(n)&&(this.lockedHeight=n-a.height-i.height),'both'===e&&(0,d.isNumber)(t)&&(0,d.isNumber)(n)&&(this.lockedWidth=t-a.width-i.width,this.lockedHeight=n-a.height-i.height),this.displayed&&this.iframe&&this.expand()}},{key:'expand',value:function(){var e=this.lockedWidth,t=this.lockedHeight,n;!this.iframe||this._expanding||(this._expanding=!0,'pre-paginated'===this.layout.name?(e=this.layout.columnWidth,t=this.layout.height):'horizontal'===this.settings.axis?(e=this.contents.textWidth(),0<e%this.layout.pageWidth&&(e=a(e/this.layout.pageWidth)*this.layout.pageWidth),this.settings.forceEvenPages&&(n=e/this.layout.delta,1<this.layout.divisor&&'reflowable'===this.layout.name&&0<n%2&&(e+=this.layout.gap+this.layout.columnWidth))):'vertical'===this.settings.axis&&(t=this.contents.textHeight()),(this._needsReframe||e!=this._width||t!=this._height)&&this.reframe(e,t),this._expanding=!1)}},{key:'reframe',value:function(e,t){var n;(0,d.isNumber)(e)&&(this.element.style.width=e+'px',this.iframe.style.width=e+'px',this._width=e),(0,d.isNumber)(t)&&(this.element.style.height=t+'px',this.iframe.style.height=t+'px',this._height=t);var a=this.prevBounds?e-this.prevBounds.width:e,i=this.prevBounds?t-this.prevBounds.height:t;n={width:e,height:t,widthDelta:a,heightDelta:i},this.pane&&this.pane.render(),this.onResize(this,n),this.emit(g.EVENTS.VIEWS.RESIZED,n),this.prevBounds=n,this.elementBounds=(0,d.bounds)(this.element)}},{key:'load',value:function(e){var t=new d.defer,n=t.promise;if(!this.iframe)return t.reject(new Error('No Iframe Available')),n;if(this.iframe.onload=function(e){this.onLoad(e,t)}.bind(this),'blobUrl'===this.settings.method)this.blobUrl=(0,d.createBlobUrl)(e,'application/xhtml+xml'),this.iframe.src=this.blobUrl;else if('srcdoc'===this.settings.method)this.iframe.srcdoc=e;else{if(this.document=this.iframe.contentDocument,!this.document)return t.reject(new Error('No Document Available')),n;this.iframe.contentDocument.open(),this.iframe.contentDocument.write(e),this.iframe.contentDocument.close()}return n}},{key:'onLoad',value:function(e,t){var n=this;this.window=this.iframe.contentWindow,this.document=this.iframe.contentDocument,this.contents=new h.default(this.document,this.document.body,this.section.cfiBase,this.section.index),this.rendering=!1;var a=this.document.querySelector('link[rel=\'canonical\']');a?a.setAttribute('href',this.section.canonical):(a=this.document.createElement('link'),a.setAttribute('rel','canonical'),a.setAttribute('href',this.section.canonical),this.document.querySelector('head').appendChild(a)),this.contents.on(g.EVENTS.CONTENTS.EXPAND,function(){n.displayed&&n.iframe&&(n.expand(),n.contents&&n.layout.format(n.contents))}),this.contents.on(g.EVENTS.CONTENTS.RESIZE,function(){n.displayed&&n.iframe&&(n.expand(),n.contents&&n.layout.format(n.contents))}),t.resolve(this.contents)}},{key:'setLayout',value:function(e){this.layout=e,this.contents&&(this.layout.format(this.contents),this.expand())}},{key:'setAxis',value:function(e){'scrolled'===this.layout.props.flow&&(e='vertical'),this.settings.axis=e,this.element.style.flex='horizontal'==e?'none':'initial',this.size()}},{key:'addListeners',value:function(){}},{key:'removeListeners',value:function(){}},{key:'display',value:function(e){var t=new d.defer;return this.displayed?t.resolve(this):this.render(e).then(function(){this.emit(g.EVENTS.VIEWS.DISPLAYED,this),this.onDisplayed(this),this.displayed=!0,t.resolve(this)}.bind(this),function(e){t.reject(e,this)}),t.promise}},{key:'show',value:function(){this.element.style.visibility='visible',this.iframe&&(this.iframe.style.visibility='visible'),this.emit(g.EVENTS.VIEWS.SHOWN,this)}},{key:'hide',value:function(){this.element.style.visibility='hidden',this.iframe.style.visibility='hidden',this.stopExpanding=!0,this.emit(g.EVENTS.VIEWS.HIDDEN,this)}},{key:'offset',value:function(){return{top:this.element.offsetTop,left:this.element.offsetLeft}}},{key:'width',value:function(){return this._width}},{key:'height',value:function(){return this._height}},{key:'position',value:function(){return this.element.getBoundingClientRect()}},{key:'locationOf',value:function(e){var t=this.iframe.getBoundingClientRect(),n=this.contents.locationOf(e,this.settings.ignoreClass);return{left:n.left,top:n.top}}},{key:'onDisplayed',value:function(){}},{key:'onResize',value:function(){}},{key:'bounds',value:function(e){return(e||!this.elementBounds)&&(this.elementBounds=(0,d.bounds)(this.element)),this.elementBounds}},{key:'highlight',value:function(e){var t=this,n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},a=arguments[2];if(this.contents){var i=this.contents.range(e),o=function(){t.emit(g.EVENTS.VIEWS.MARK_CLICKED,e,n)};n.epubcfi=e,this.pane||(this.pane=new f.Pane(this.iframe,this.element));var s=new f.Highlight(i,'epubjs-hl',n,{fill:'yellow',"fill-opacity":'0.3',"mix-blend-mode":'multiply'}),r=this.pane.addMark(s);return this.highlights[e]={mark:r,element:r.element,listeners:[o,a]},r.element.setAttribute('ref','epubjs-hl'),r.element.addEventListener('click',o),r.element.addEventListener('touchstart',o),a&&(r.element.addEventListener('click',a),r.element.addEventListener('touchstart',a)),r}}},{key:'underline',value:function(e){var t=this,n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},a=arguments[2];if(this.contents){var i=this.contents.range(e),o=function(){t.emit(g.EVENTS.VIEWS.MARK_CLICKED,e,n)};n.epubcfi=e,this.pane||(this.pane=new f.Pane(this.iframe,this.element));var s=new f.Underline(i,'epubjs-ul',n,{stroke:'black',"stroke-opacity":'0.3',"mix-blend-mode":'multiply'}),r=this.pane.addMark(s);return this.underlines[e]={mark:r,element:r.element,listeners:[o,a]},r.element.setAttribute('ref','epubjs-ul'),r.element.addEventListener('click',o),r.element.addEventListener('touchstart',o),a&&(r.element.addEventListener('click',a),r.element.addEventListener('touchstart',a)),r}}},{key:'mark',value:function(e){var t=this,n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},a=arguments[2];if(this.contents){if(e in this.marks){var o=this.marks[e];return o}var s=this.contents.range(e);if(s){var r=s.commonAncestorContainer,l=1===r.nodeType?r:r.parentNode,d=function(){t.emit(g.EVENTS.VIEWS.MARK_CLICKED,e,n)};s.collapsed&&1===r.nodeType?(s=new Range,s.selectNodeContents(r)):s.collapsed&&(s=new Range,s.selectNodeContents(l));var u,c,p;if('pre-paginated'===this.layout.name||'horizontal'!==this.settings.axis){var h=s.getBoundingClientRect();u=h.top,c=h.right}else for(var f=s.getClientRects(),m=void 0,y=0;y!=f.length;y++)m=f[y],(!p||m.left<p)&&(p=m.left,c=p+this.layout.columnWidth-this.layout.gap,u=m.top);var i=this.document.createElement('a');return i.setAttribute('ref','epubjs-mk'),i.style.position='absolute',i.style.top=u+'px',i.style.left=c+'px',i.dataset.epubcfi=e,n&&Object.keys(n).forEach(function(e){i.dataset[e]=n[e]}),a&&(i.addEventListener('click',a),i.addEventListener('touchstart',a)),i.addEventListener('click',d),i.addEventListener('touchstart',d),this.element.appendChild(i),this.marks[e]={element:i,listeners:[d,a]},l}}}},{key:'unhighlight',value:function(e){var t;e in this.highlights&&(t=this.highlights[e],this.pane.removeMark(t.mark),t.listeners.forEach(function(e){e&&t.element.removeEventListener('click',e)}),delete this.highlights[e])}},{key:'ununderline',value:function(e){var t;e in this.underlines&&(t=this.underlines[e],this.pane.removeMark(t.mark),t.listeners.forEach(function(e){e&&t.element.removeEventListener('click',e)}),delete this.underlines[e])}},{key:'unmark',value:function(e){var t;e in this.marks&&(t=this.marks[e],this.element.removeChild(t.element),t.listeners.forEach(function(e){e&&t.element.removeEventListener('click',e)}),delete this.marks[e])}},{key:'destroy',value:function(){for(var e in this.highlights)this.unhighlight(e);for(var t in this.underlines)this.ununderline(t);for(var n in this.marks)this.unmark(n);this.blobUrl&&(0,d.revokeBlobUrl)(this.blobUrl),this.displayed&&(this.displayed=!1,this.removeListeners(),this.stopExpanding=!0,this.element.removeChild(this.iframe),this.iframe=null,this._textWidth=null,this._textHeight=null,this._width=null,this._height=null)}}]),e}();(0,l.default)(m.prototype),t.default=m,e.exports=t['default']},function(e,t,n){var a=n(15),i=n(58),s=n(60),r=Math.min;e.exports=function(e,t,n){function l(t){var n=b,a=k;return b=k=void 0,f=t,E=e.apply(a,n),E}function d(e){return f=e,_=setTimeout(p,t),m?l(e):E}function u(e){var n=e-w,a=e-f,i=t-n;return y?r(i,x-a):i}function c(e){var n=e-w,a=e-f;return void 0==w||n>=t||0>n||y&&a>=x}function p(){var e=i();return c(e)?h(e):void(_=setTimeout(p,u(e)))}function h(e){return(_=void 0,v&&b)?l(e):(b=k=void 0,E)}function g(){var e=i(),n=c(e);if(b=arguments,k=this,w=e,n){if(void 0===_)return d(w);if(y)return _=setTimeout(p,t),l(w)}return void 0===_&&(_=setTimeout(p,t)),E}var f=0,m=!1,y=!1,v=!0,b,k,x,E,_,w;if('function'!=typeof e)throw new TypeError('Expected a function');return t=s(t)||0,a(n)&&(m=!!n.leading,y='maxWait'in n,x=y?o(s(n.maxWait)||0,t):x,v='trailing'in n?!!n.trailing:v),g.cancel=function(){void 0!==_&&clearTimeout(_),f=0,b=w=k=_=void 0},g.flush=function(){return void 0===_?E:h(i())},g}},function(e,t,n){var a=n(59),i='object'==typeof self&&self&&self.Object===Object&&self,o=a||i||Function('return this')();e.exports=o},function(e,t,n){var a=n(22),i=a.Symbol;e.exports=i},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}function o(e,t){if(!e)throw new ReferenceError('this hasn\'t been initialised - super() hasn\'t been called');return t&&('object'==typeof t||'function'==typeof t)?t:e}function r(e,t){if('function'!=typeof t&&null!==t)throw new TypeError('Super expression must either be null or a function, not '+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,'__esModule',{value:!0});var l=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),d=n(0),u=n(14),c=a(u),p=n(3),h=n(21),g=a(h),f=function(e){function t(e){i(this,t);var n=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.name='continuous',n.settings=(0,d.extend)(n.settings||{},{infinite:!0,overflow:void 0,axis:void 0,flow:'scrolled',offset:500,offsetDelta:250,width:void 0,height:void 0}),(0,d.extend)(n.settings,e.settings||{}),'undefined'!=e.settings.gap&&0===e.settings.gap&&(n.settings.gap=e.settings.gap),n.viewSettings={ignoreClass:n.settings.ignoreClass,axis:n.settings.axis,flow:n.settings.flow,layout:n.layout,width:0,height:0,forceEvenPages:!1},n.scrollTop=0,n.scrollLeft=0,n}return r(t,e),l(t,[{key:'display',value:function(e,t){return c.default.prototype.display.call(this,e,t).then(function(){return this.fill()}.bind(this))}},{key:'fill',value:function(e){var t=this,n=e||new d.defer;return this.q.enqueue(function(){return t.check()}).then(function(e){e?t.fill(n):n.resolve()}),n.promise}},{key:'moveTo',value:function(e){var t=0,n=0,a=0,i=0;this.isPaginated?(t=s(e.left/this.layout.delta)*this.layout.delta,a=t+this.settings.offset):(n=e.top,i=e.top+this.settings.offset),(0<t||0<n)&&this.scrollBy(t,n,!0)}},{key:'afterResized',value:function(e){this.emit(p.EVENTS.MANAGERS.RESIZE,e.section)}},{key:'removeShownListeners',value:function(e){e.onDisplayed=function(){}}},{key:'add',value:function(e){var t=this,n=this.createView(e);return this.views.append(n),n.on(p.EVENTS.VIEWS.RESIZED,function(){n.expanded=!0}),n.on(p.EVENTS.VIEWS.AXIS,function(e){t.updateAxis(e)}),n.onDisplayed=this.afterDisplayed.bind(this),n.onResize=this.afterResized.bind(this),n.display(this.request)}},{key:'append',value:function(e){var t=this.createView(e);return t.on(p.EVENTS.VIEWS.RESIZED,function(){t.expanded=!0}),this.views.append(t),t.onDisplayed=this.afterDisplayed.bind(this),t}},{key:'prepend',value:function(e){var t=this,n=this.createView(e);return n.on(p.EVENTS.VIEWS.RESIZED,function(e){t.counter(e),n.expanded=!0}),this.views.prepend(n),n.onDisplayed=this.afterDisplayed.bind(this),n}},{key:'counter',value:function(e){'vertical'===this.settings.axis?this.scrollBy(0,e.heightDelta,!0):this.scrollBy(e.widthDelta,0,!0)}},{key:'update',value:function(e){for(var t=this.bounds(),n=this.views.all(),a=n.length,o=[],s='undefined'==typeof e?this.settings.offset||0:e,r=new d.defer,l=[],u=0,i,c;u<a;u++)if(c=n[u],i=this.isVisible(c,s,s,t),!0===i){if(!c.displayed){var p=c.display(this.request).then(function(e){e.show()},function(){c.hide()});l.push(p)}else c.show();o.push(c)}else this.q.enqueue(c.destroy.bind(c)),clearTimeout(this.trimTimeout),this.trimTimeout=setTimeout(function(){this.q.enqueue(this.trim.bind(this))}.bind(this),250);return l.length?Promise.all(l).catch(function(e){r.reject(e)}):(r.resolve(),r.promise)}},{key:'check',value:function(e,t){var n=this,a=new d.defer,i=[],o='horizontal'===this.settings.axis,s=this.settings.offset||0;e&&o&&(s=e),t&&!o&&(s=t);var r=this._bounds,l='rtl'===this.settings.direction,u=o&&l?-1:1,c=o?this.scrollLeft:this.scrollTop*u,p=o?r.width:r.height,h=o?this.container.scrollWidth:this.container.scrollHeight,g=function(){var e=n.views.first(),t=e&&e.section.prev();t&&i.push(n.prepend(t))},f=function(){var e=n.views.last(),t=e&&e.section.next();t&&i.push(n.append(t))};c+p+s>=h&&(o&&l?g():f()),0>c-s&&(o&&l?f():g());var m=i.map(function(e){return e.displayed});return i.length?Promise.all(m).then(function(){if('pre-paginated'===n.layout.name&&n.layout.props.spread)return n.check()}).then(function(){return n.update(s)},function(e){return e}):(this.q.enqueue(function(){this.update()}.bind(this)),a.resolve(!1),a.promise)}},{key:'trim',value:function(){for(var e=new d.defer,t=this.views.displayed(),n=t[0],a=t[t.length-1],o=this.views.indexOf(n),s=this.views.indexOf(a),r=this.views.slice(0,o),l=this.views.slice(s+1),u=0;u<r.length-1;u++)this.erase(r[u],r);for(var i=1;i<l.length;i++)this.erase(l[i]);return e.resolve(),e.promise}},{key:'erase',value:function(e,t){var n,a;this.settings.height?(n=this.container.scrollTop,a=this.container.scrollLeft):(n=window.scrollY,a=window.scrollX);var i=e.bounds();this.views.remove(e),t&&('vertical'===this.settings.axis?this.scrollTo(0,n-i.height,!0):this.scrollTo(a-i.width,0,!0))}},{key:'addEventListeners',value:function(){window.addEventListener('unload',function(){this.ignore=!0,this.destroy()}.bind(this)),this.addScrollListeners()}},{key:'addScrollListeners',value:function(){var e;this.tick=d.requestAnimationFrame,this.settings.height?(this.prevScrollTop=this.container.scrollTop,this.prevScrollLeft=this.container.scrollLeft):(this.prevScrollTop=window.scrollY,this.prevScrollLeft=window.scrollX),this.scrollDeltaVert=0,this.scrollDeltaHorz=0,this.settings.height?(e=this.container,this.scrollTop=this.container.scrollTop,this.scrollLeft=this.container.scrollLeft):(e=window,this.scrollTop=window.scrollY,this.scrollLeft=window.scrollX),e.addEventListener('scroll',this.onScroll.bind(this)),this._scrolled=(0,g.default)(this.scrolled.bind(this),30),this.didScroll=!1}},{key:'removeEventListeners',value:function(){var e;e=this.settings.height?this.container:window,e.removeEventListener('scroll',this.onScroll.bind(this))}},{key:'onScroll',value:function(){var e=Math.abs,t=void 0,n=void 0,a='rtl'===this.settings.direction?-1:1;this.settings.height?(t=this.container.scrollTop,n=this.container.scrollLeft):(t=window.scrollY*a,n=window.scrollX*a),this.scrollTop=t,this.scrollLeft=n,this.ignore?this.ignore=!1:this._scrolled(),this.scrollDeltaVert+=e(t-this.prevScrollTop),this.scrollDeltaHorz+=e(n-this.prevScrollLeft),this.prevScrollTop=t,this.prevScrollLeft=n,clearTimeout(this.scrollTimeout),this.scrollTimeout=setTimeout(function(){this.scrollDeltaVert=0,this.scrollDeltaHorz=0}.bind(this),150),this.didScroll=!1}},{key:'scrolled',value:function(){this.q.enqueue(function(){this.check()}.bind(this)),this.emit(p.EVENTS.MANAGERS.SCROLL,{top:this.scrollTop,left:this.scrollLeft}),clearTimeout(this.afterScrolled),this.afterScrolled=setTimeout(function(){this.emit(p.EVENTS.MANAGERS.SCROLLED,{top:this.scrollTop,left:this.scrollLeft})}.bind(this))}},{key:'next',value:function(){var e=this.settings.direction,t='pre-paginated'===this.layout.props.name&&this.layout.props.spread?2*this.layout.props.delta:this.layout.props.delta;this.views.length&&(this.isPaginated&&'horizontal'===this.settings.axis?this.scrollBy(t,0,!0):this.scrollBy(0,this.layout.height,!0),this.q.enqueue(function(){this.check()}.bind(this)))}},{key:'prev',value:function(){var e=this.settings.direction,t='pre-paginated'===this.layout.props.name&&this.layout.props.spread?2*this.layout.props.delta:this.layout.props.delta;this.views.length&&(this.isPaginated&&'horizontal'===this.settings.axis?this.scrollBy(-t,0,!0):this.scrollBy(0,-this.layout.height,!0),this.q.enqueue(function(){this.check()}.bind(this)))}},{key:'updateAxis',value:function(e,t){this.isPaginated||(e='vertical'),(t||e!==this.settings.axis)&&(this.settings.axis=e,this.stage&&this.stage.axis(e),this.viewSettings.axis=e,this.mapping&&this.mapping.axis(e),this.layout&&('vertical'===e?this.layout.spread('none'):this.layout.spread(this.layout.settings.spread)),this.settings.infinite='vertical'===e)}}]),t}(c.default);t.default=f,e.exports=t['default']},function(e,t,n){'use strict';(function(a){function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){return new r.default(e,t)}Object.defineProperty(t,'__esModule',{value:!0});var s=n(26),r=i(s),l=n(18),d=i(l),u=n(1),c=i(u),p=n(13),h=i(p),g=n(0),f=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(g);n(69);var m=n(20),y=i(m),v=n(14),b=i(v),k=n(24),x=i(k);o.VERSION='0.3','undefined'!=typeof a&&(a.EPUBJS_VERSION=o.VERSION),o.Book=r.default,o.Rendition=d.default,o.Contents=h.default,o.CFI=c.default,o.utils=f,t.default=o,e.exports=t['default']}).call(t,n(8))},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o='function'==typeof Symbol&&'symbol'==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&'function'==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?'symbol':typeof e},s=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),r=n(2),l=a(r),d=n(0),u=n(5),c=a(u),p=n(4),h=a(p),g=n(42),f=a(g),m=n(44),y=a(m),v=n(45),b=a(v),k=n(46),x=a(k),E=n(47),_=a(E),w=n(48),S=a(w),C=n(49),T=a(C),N=n(18),R=a(N),L=n(67),P=a(L),A=n(11),I=a(A),O=n(1),z=a(O),D=n(3),B='META-INF/container.xml',q={BINARY:'binary',BASE64:'base64',EPUB:'epub',OPF:'opf',MANIFEST:'json',DIRECTORY:'directory'},M=function(){function e(t,n){var a=this;i(this,e),'undefined'==typeof n&&'object'===('undefined'==typeof t?'undefined':o(t))&&(n=t,t=void 0),this.settings=(0,d.extend)(this.settings||{},{requestMethod:void 0,requestCredentials:void 0,requestHeaders:void 0,encoding:void 0,replacements:void 0,canonical:void 0}),(0,d.extend)(this.settings,n),this.opening=new d.defer,this.opened=this.opening.promise,this.isOpen=!1,this.loading={manifest:new d.defer,spine:new d.defer,metadata:new d.defer,cover:new d.defer,navigation:new d.defer,pageList:new d.defer,resources:new d.defer},this.loaded={manifest:this.loading.manifest.promise,spine:this.loading.spine.promise,metadata:this.loading.metadata.promise,cover:this.loading.cover.promise,navigation:this.loading.navigation.promise,pageList:this.loading.pageList.promise,resources:this.loading.resources.promise},this.ready=Promise.all([this.loaded.manifest,this.loaded.spine,this.loaded.metadata,this.loaded.cover,this.loaded.navigation,this.loaded.resources]),this.isRendered=!1,this.request=this.settings.requestMethod||I.default,this.spine=new f.default,this.locations=new y.default(this.spine,this.load.bind(this)),this.navigation=void 0,this.pageList=void 0,this.url=void 0,this.path=void 0,this.archived=!1,this.archive=void 0,this.resources=void 0,this.rendition=void 0,this.container=void 0,this.packaging=void 0,t&&this.open(t).catch(function(){var e=new Error('Cannot load book at '+t);a.emit(D.EVENTS.BOOK.OPEN_FAILED,e)})}return s(e,[{key:'open',value:function(e,t){var n=t||this.determineType(e),a;return n===q.BINARY?(this.archived=!0,this.url=new c.default('/',''),a=this.openEpub(e)):n===q.BASE64?(this.archived=!0,this.url=new c.default('/',''),a=this.openEpub(e,n)):n===q.EPUB?(this.archived=!0,this.url=new c.default('/',''),a=this.request(e,'binary').then(this.openEpub.bind(this))):n==q.OPF?(this.url=new c.default(e),a=this.openPackaging(this.url.Path.toString())):n==q.MANIFEST?(this.url=new c.default(e),a=this.openManifest(this.url.Path.toString())):(this.url=new c.default(e),a=this.openContainer(B).then(this.openPackaging.bind(this))),a}},{key:'openEpub',value:function(e,t){var n=this;return this.unarchive(e,t||this.settings.encoding).then(function(){return n.openContainer(B)}).then(function(e){return n.openPackaging(e)})}},{key:'openContainer',value:function(e){var t=this;return this.load(e).then(function(e){return t.container=new b.default(e),t.resolve(t.container.packagePath)})}},{key:'openPackaging',value:function(e){var t=this;return this.path=new h.default(e),this.load(e).then(function(e){return t.packaging=new x.default(e),t.unpack(t.packaging)})}},{key:'openManifest',value:function(e){var t=this;return this.path=new h.default(e),this.load(e).then(function(e){return t.packaging=new x.default,t.packaging.load(e),t.unpack(t.packaging)})}},{key:'load',value:function(e){var t;return this.archived?(t=this.resolve(e),this.archive.request(t)):(t=this.resolve(e),this.request(t,null,this.settings.requestCredentials,this.settings.requestHeaders))}},{key:'resolve',value:function(e,t){if(e){var n=e,a=-1<e.indexOf('://');return a?e:(this.path&&(n=this.path.resolve(e)),!1!=t&&this.url&&(n=this.url.resolve(n)),n)}}},{key:'canonical',value:function(e){var t=e;return e?(t=this.settings.canonical?this.settings.canonical(e):this.resolve(e,!0),t):''}},{key:'determineType',value:function(e){var t,n,a;return'base64'===this.settings.encoding?q.BASE64:'string'==typeof e?(t=new c.default(e),n=t.path(),a=n.extension,a?'epub'===a?q.EPUB:'opf'===a?q.OPF:'json'===a?q.MANIFEST:void 0:q.DIRECTORY):q.BINARY}},{key:'unpack',value:function(e){var t=this;this.package=e,this.spine.unpack(this.package,this.resolve.bind(this),this.canonical.bind(this)),this.resources=new S.default(this.package.manifest,{archive:this.archive,resolver:this.resolve.bind(this),request:this.request.bind(this),replacements:this.settings.replacements||(this.archived?'blobUrl':'base64')}),this.loadNavigation(this.package).then(function(){t.loading.navigation.resolve(t.navigation)}),this.package.coverPath&&(this.cover=this.resolve(this.package.coverPath)),this.loading.manifest.resolve(this.package.manifest),this.loading.metadata.resolve(this.package.metadata),this.loading.spine.resolve(this.spine),this.loading.cover.resolve(this.cover),this.loading.resources.resolve(this.resources),this.loading.pageList.resolve(this.pageList),this.isOpen=!0,this.archived||this.settings.replacements&&'none'!=this.settings.replacements?this.replacements().then(function(){t.opening.resolve(t)}).catch(function(e){console.error(e)}):this.opening.resolve(this)}},{key:'loadNavigation',value:function(e){var t=this,n=e.navPath||e.ncxPath,a=e.toc;return a?new Promise(function(n){t.navigation=new _.default(a),e.pageList&&(t.pageList=new T.default(e.pageList)),n(t.navigation)}):n?this.load(n,'xml').then(function(e){return t.navigation=new _.default(e),t.pageList=new T.default(e),t.navigation}):new Promise(function(e){t.navigation=new _.default,t.pageList=new T.default,e(t.navigation)})}},{key:'section',value:function(e){return this.spine.get(e)}},{key:'renderTo',value:function(e,t){return this.rendition=new R.default(this,t),this.rendition.attachTo(e),this.rendition}},{key:'setRequestCredentials',value:function(e){this.settings.requestCredentials=e}},{key:'setRequestHeaders',value:function(e){this.settings.requestHeaders=e}},{key:'unarchive',value:function(e,t){return this.archive=new P.default,this.archive.open(e,t)}},{key:'coverUrl',value:function(){var e=this,t=this.loaded.cover.then(function(){return e.archived?e.resources.get(e.cover):e.cover});return t}},{key:'replacements',value:function(){var e=this;return this.spine.hooks.serialize.register(function(t,n){n.output=e.resources.substitute(t,n.url)}),this.resources.replacements().then(function(){return e.resources.replaceCss()})}},{key:'getRange',value:function(e){var t=new z.default(e),n=this.spine.get(t.spinePos),a=this.load.bind(this);return n?n.load(a).then(function(){var e=t.toRange(n.document);return e}):new Promise(function(e,t){t('CFI could not be found')})}},{key:'key',value:function(e){var t=e||this.package.metadata.identifier||this.url.filename;return'epubjs:'+'0.3'+':'+t}},{key:'destroy',value:function(){this.opened=void 0,this.loading=void 0,this.loaded=void 0,this.ready=void 0,this.isOpen=!1,this.isRendered=!1,this.spine&&this.spine.destroy(),this.locations&&this.locations.destroy(),this.pageList&&this.pageList.destroy(),this.archive&&this.archive.destroy(),this.resources&&this.resources.destroy(),this.container&&this.container.destroy(),this.packaging&&this.packaging.destroy(),this.rendition&&this.rendition.destroy(),this.spine=void 0,this.locations=void 0,this.pageList=void 0,this.archive=void 0,this.resources=void 0,this.container=void 0,this.packaging=void 0,this.rendition=void 0,this.navigation=void 0,this.url=void 0,this.path=void 0,this.archived=!1}}]),e}();(0,l.default)(M.prototype),t.default=M,e.exports=t['default']},function(e,t,n){'use strict';var a=n(28),i=n(36),o=n(37),s=n(38),r;r=e.exports=function(t,n){var o,r,l,d,u;return 2>arguments.length||'string'!=typeof t?(d=n,n=t,t=null):d=arguments[2],null==t?(o=l=!0,r=!1):(o=s.call(t,'c'),r=s.call(t,'e'),l=s.call(t,'w')),u={value:n,configurable:o,enumerable:r,writable:l},d?a(i(d),u):u},r.gs=function(t,n,r){var l,d,u,p;return'string'==typeof t?u=arguments[3]:(u=r,r=n,n=t,t=null),null==n?n=void 0:o(n)?null==r?r=void 0:!o(r)&&(u=r,r=void 0):(u=n,n=r=void 0),null==t?(l=!0,d=!1):(l=s.call(t,'c'),d=s.call(t,'e')),p={get:n,set:r,configurable:l,enumerable:d},u?a(i(u),p):p}},function(e,t,n){'use strict';e.exports=n(29)()?Object.assign:n(30)},function(e){'use strict';e.exports=function(){var e=Object.assign,t;return!('function'!=typeof e)&&(t={foo:'raz'},e(t,{bar:'dwa'},{trzy:'trzy'}),'razdwatrzy'===t.foo+t.bar+t.trzy)}},function(e,t,n){'use strict';var a=n(31),s=n(35);e.exports=function(e,t){var n=o(arguments.length,2),r,l,i;for(e=Object(s(e)),i=function(n){try{e[n]=t[n]}catch(t){r||(r=t)}},l=1;l<n;++l)t=arguments[l],a(t).forEach(i);if(r!==void 0)throw r;return e}},function(e,t,n){'use strict';e.exports=n(32)()?Object.keys:n(33)},function(e){'use strict';e.exports=function(){try{return Object.keys('primitive'),!0}catch(t){return!1}}},function(e,t,n){'use strict';var a=n(9),i=Object.keys;e.exports=function(e){return i(a(e)?Object(e):e)}},function(e){'use strict';e.exports=function(){}},function(e,t,n){'use strict';var a=n(9);e.exports=function(e){if(!a(e))throw new TypeError('Cannot use null or undefined');return e}},function(e,t,n){'use strict';var a=n(9),i=Array.prototype.forEach,o=Object.create,s=function(e,t){for(var n in e)t[n]=e[n]};e.exports=function(){var e=o(null);return i.call(arguments,function(t){a(t)&&s(Object(t),e)}),e}},function(e){'use strict';e.exports=function(e){return'function'==typeof e}},function(e,t,a){'use strict';e.exports=a(39)()?n.contains:a(40)},function(e){'use strict';var t='razdwatrzy';e.exports=function(){return!('function'!=typeof t.contains)&&!0===t.contains('dwa')&&!1===t.contains('foo')}},function(e){'use strict';var t=n.indexOf;e.exports=function(e){return-1<t.call(this,e,arguments[1])}},function(e){'use strict';e.exports=function(e){if('function'!=typeof e)throw new TypeError(e+' is not a function');return e}},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(1),r=a(s),l=n(10),d=a(l),u=n(43),c=a(u),p=n(7),h=function(){function e(){i(this,e),this.spineItems=[],this.spineByHref={},this.spineById={},this.hooks={},this.hooks.serialize=new d.default,this.hooks.content=new d.default,this.hooks.content.register(p.replaceBase),this.hooks.content.register(p.replaceCanonical),this.hooks.content.register(p.replaceMeta),this.epubcfi=new r.default,this.loaded=!1,this.items=void 0,this.manifest=void 0,this.spineNodeIndex=void 0,this.baseUrl=void 0,this.length=void 0}return o(e,[{key:'unpack',value:function(e,t,n){var a=this;this.items=e.spine,this.manifest=e.manifest,this.spineNodeIndex=e.spineNodeIndex,this.baseUrl=e.baseUrl||e.basePath||'',this.length=this.items.length,this.items.forEach(function(e,i){var o=a.manifest[e.idref],s;e.index=i,e.cfiBase=a.epubcfi.generateChapterComponent(a.spineNodeIndex,e.index,e.idref),e.href&&(e.url=t(e.href,!0),e.canonical=n(e.href)),o&&(e.href=o.href,e.url=t(e.href,!0),e.canonical=n(e.href),o.properties.length&&e.properties.push.apply(e.properties,o.properties)),'yes'===e.linear?(e.prev=function(){for(var t=e.index,n;0<t;){if(n=this.get(t-1),n&&n.linear)return n;t-=1}}.bind(a),e.next=function(){for(var t=e.index,n;t<this.spineItems.length-1;){if(n=this.get(t+1),n&&n.linear)return n;t+=1}}.bind(a)):(e.prev=function(){},e.next=function(){}),s=new c.default(e,a.hooks),a.append(s)}),this.loaded=!0}},{key:'get',value:function(e){var t=0;if('undefined'==typeof e)for(;t<this.spineItems.length;){var n=this.spineItems[t];if(n&&n.linear)break;t+=1}else if(this.epubcfi.isCfiString(e)){var a=new r.default(e);t=a.spinePos}else'number'==typeof e||!1===isNaN(e)?t=e:'string'==typeof e&&0===e.indexOf('#')?t=this.spineById[e.substring(1)]:'string'==typeof e&&(e=e.split('#')[0],t=this.spineByHref[e]||this.spineByHref[encodeURI(e)]);return this.spineItems[t]||null}},{key:'append',value:function(e){var t=this.spineItems.length;return e.index=t,this.spineItems.push(e),this.spineByHref[decodeURI(e.href)]=t,this.spineByHref[encodeURI(e.href)]=t,this.spineByHref[e.href]=t,this.spineById[e.idref]=t,t}},{key:'prepend',value:function(e){return this.spineByHref[e.href]=0,this.spineById[e.idref]=0,this.spineItems.forEach(function(e,t){e.index=t}),0}},{key:'remove',value:function(e){var t=this.spineItems.indexOf(e);if(-1<t)return delete this.spineByHref[e.href],delete this.spineById[e.idref],this.spineItems.splice(t,1)}},{key:'each',value:function(){return this.spineItems.forEach.apply(this.spineItems,arguments)}},{key:'first',value:function(){var e=0;do{var t=this.get(e);if(t&&t.linear)return t;e+=1}while(e<this.spineItems.length)}},{key:'last',value:function(){var e=this.spineItems.length-1;do{var t=this.get(e);if(t&&t.linear)return t;e-=1}while(0<=e)}},{key:'destroy',value:function(){this.each(function(e){return e.destroy()}),this.spineItems=void 0,this.spineByHref=void 0,this.spineById=void 0,this.hooks.serialize.clear(),this.hooks.content.clear(),this.hooks=void 0,this.epubcfi=void 0,this.loaded=!1,this.items=void 0,this.manifest=void 0,this.spineNodeIndex=void 0,this.baseUrl=void 0,this.length=void 0}}]),e}();t.default=h,e.exports=t['default']},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(0),r=n(1),l=a(r),d=n(10),u=a(d),c=n(7),p=function(){function e(t,n){i(this,e),this.idref=t.idref,this.linear='yes'===t.linear,this.properties=t.properties,this.index=t.index,this.href=t.href,this.url=t.url,this.canonical=t.canonical,this.next=t.next,this.prev=t.prev,this.cfiBase=t.cfiBase,n?this.hooks=n:(this.hooks={},this.hooks.serialize=new u.default(this),this.hooks.content=new u.default(this)),this.document=void 0,this.contents=void 0,this.output=void 0}return o(e,[{key:'load',value:function(e){var t=e||this.request||n(11),a=new s.defer,i=a.promise;return this.contents?a.resolve(this.contents):t(this.url).then(function(e){return this.document=e,this.contents=e.documentElement,this.hooks.content.trigger(this.document,this)}.bind(this)).then(function(){a.resolve(this.contents)}.bind(this)).catch(function(e){a.reject(e)}),i}},{key:'base',value:function(){return(0,c.replaceBase)(this.document,this)}},{key:'render',value:function(e){var t=new s.defer,a=t.promise;return this.output,this.load(e).then(function(e){var t='undefined'!=typeof navigator&&navigator.userAgent||'',a=0<=t.indexOf('Trident'),i;i='undefined'==typeof XMLSerializer||a?n(16).XMLSerializer:XMLSerializer;var o=new i;return this.output=o.serializeToString(e),this.output}.bind(this)).then(function(){return this.hooks.serialize.trigger(this.output,this)}.bind(this)).then(function(){t.resolve(this.output)}.bind(this)).catch(function(e){t.reject(e)}),a}},{key:'find',value:function(e){var t=this,n=[],a=e.toLowerCase(),i=function(e){for(var i=e.textContent.toLowerCase(),o=t.document.createRange(),s=-1,r=150,l,d,u;-1!=d;)d=i.indexOf(a,s+1),-1!=d&&(o=t.document.createRange(),o.setStart(e,d),o.setEnd(e,d+a.length),l=t.cfiFromRange(o),e.textContent.length<r?u=e.textContent:(u=e.textContent.substring(d-r/2,d+r/2),u='...'+u+'...'),n.push({cfi:l,excerpt:u})),s=d};return(0,s.sprint)(t.document,function(e){i(e)}),n}},{key:'reconcileLayoutSettings',value:function(e){var t={layout:e.layout,spread:e.spread,orientation:e.orientation};return this.properties.forEach(function(e){var n=e.replace('rendition:',''),a=n.indexOf('-'),i,o;-1!=a&&(i=n.slice(0,a),o=n.slice(a+1),t[i]=o)}),t}},{key:'cfiFromRange',value:function(e){return new l.default(e,this.cfiBase).toString()}},{key:'cfiFromElement',value:function(e){return new l.default(e,this.cfiBase).toString()}},{key:'unload',value:function(){this.document=void 0,this.contents=void 0,this.output=void 0}},{key:'destroy',value:function(){this.unload(),this.hooks.serialize.clear(),this.hooks.content.clear(),this.hooks=void 0,this.idref=void 0,this.linear=void 0,this.properties=void 0,this.index=void 0,this.href=void 0,this.url=void 0,this.next=void 0,this.prev=void 0,this.cfiBase=void 0}}]),e}();t.default=p,e.exports=t['default']},function(e,t,n){'use strict';function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var s=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),r=n(0),l=n(12),d=i(l),u=n(1),c=i(u),p=n(3),h=n(2),g=i(h),f=function(){function e(t,n,a){o(this,e),this.spine=t,this.request=n,this.pause=a||100,this.q=new d.default(this),this.epubcfi=new c.default,this._locations=[],this.total=0,this.break=150,this._current=0,this.currentLocation='',this._currentCfi='',this.processingTimeout=void 0}return s(e,[{key:'generate',value:function(e){return e&&(this.break=e),this.q.pause(),this.spine.each(function(e){e.linear&&this.q.enqueue(this.process.bind(this),e)}.bind(this)),this.q.run().then(function(){return this.total=this._locations.length-1,this._currentCfi&&(this.currentLocation=this._currentCfi),this._locations}.bind(this))}},{key:'createRange',value:function(){return{startContainer:void 0,startOffset:void 0,endContainer:void 0,endOffset:void 0}}},{key:'process',value:function(e){return e.load(this.request).then(function(t){var n=new r.defer,a=this.parse(t,e.cfiBase);return this._locations=this._locations.concat(a),e.unload(),this.processingTimeout=setTimeout(function(){return n.resolve(a)},this.pause),n.promise}.bind(this))}},{key:'parse',value:function(e,t,n){var a=[],i=e.ownerDocument,o=(0,r.qs)(i,'body'),s=0,l=n||this.break,d,u;if((0,r.sprint)(o,function(e){var n=e.length,i=0,o;if(0===e.textContent.trim().length)return!1;for(0==s&&(d=this.createRange(),d.startContainer=e,d.startOffset=0),o=l-s,o>n&&(s+=n,i=n);i<n;)if(o=l-s,0===s&&(i+=1,d=this.createRange(),d.startContainer=e,d.startOffset=i),i+o>=n)s+=n-i,i=n;else{i+=o,d.endContainer=e,d.endOffset=i;var r=new c.default(d,t).toString();a.push(r),s=0}u=e}.bind(this)),d&&d.startContainer&&u){d.endContainer=u,d.endOffset=u.length;var p=new c.default(d,t).toString();a.push(p),s=0}return a}},{key:'locationFromCfi',value:function(e){var t;return(c.default.prototype.isCfiString(e)&&(e=new c.default(e)),0===this._locations.length)?-1:(t=(0,r.locationOf)(e,this._locations,this.epubcfi.compare),t>this.total?this.total:t)}},{key:'percentageFromCfi',value:function(e){if(0===this._locations.length)return null;var t=this.locationFromCfi(e);return this.percentageFromLocation(t)}},{key:'percentageFromLocation',value:function(e){return e&&this.total?e/this.total:0}},{key:'cfiFromLocation',value:function(e){var t=-1;return'number'!=typeof e&&(e=parseInt(e)),0<=e&&e<this._locations.length&&(t=this._locations[e]),t}},{key:'cfiFromPercentage',value:function(e){var t;if(1<e&&console.warn('Normalize cfiFromPercentage value to between 0 - 1'),1<=e){var n=new c.default(this._locations[this.total]);return n.collapse(),n.toString()}return t=a(this.total*e),this.cfiFromLocation(t)}},{key:'load',value:function(e){return this._locations='string'==typeof e?JSON.parse(e):e,this.total=this._locations.length-1,this._locations}},{key:'save',value:function(){return JSON.stringify(this._locations)}},{key:'getCurrent',value:function(){return this._current}},{key:'setCurrent',value:function(e){var t;if('string'==typeof e)this._currentCfi=e;else if('number'==typeof e)this._current=e;else return;0===this._locations.length||('string'==typeof e?(t=this.locationFromCfi(e),this._current=t):t=e,this.emit(p.EVENTS.LOCATIONS.CHANGED,{percentage:this.percentageFromLocation(t)}))}},{key:'length',value:function(){return this._locations.length}},{key:'destroy',value:function(){this.spine=void 0,this.request=void 0,this.pause=void 0,this.q.stop(),this.q=void 0,this.epubcfi=void 0,this._locations=void 0,this.total=void 0,this.break=void 0,this._current=void 0,this.currentLocation=void 0,this._currentCfi=void 0,clearTimeout(this.processingTimeout)}},{key:'currentLocation',get:function(){return this._current},set:function(e){this.setCurrent(e)}}]),e}();(0,g.default)(f.prototype),t.default=f,e.exports=t['default']},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var i=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),o=n(6),s=function(e){return e&&e.__esModule?e:{default:e}}(o),r=n(0),l=function(){function e(t){a(this,e),this.packagePath='',this.directory='',this.encoding='',t&&this.parse(t)}return i(e,[{key:'parse',value:function(e){var t;if(!e)throw new Error('Container File Not Found');if(t=(0,r.qs)(e,'rootfile'),!t)throw new Error('No RootFile Found');this.packagePath=t.getAttribute('full-path'),this.directory=s.default.dirname(this.packagePath),this.encoding=e.xmlEncoding}},{key:'destroy',value:function(){this.packagePath=void 0,this.directory=void 0,this.encoding=void 0}}]),e}();t.default=l,e.exports=t['default']},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var i=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),o=n(0),s=function(){function e(t){a(this,e),this.manifest={},this.navPath='',this.ncxPath='',this.coverPath='',this.spineNodeIndex=0,this.spine=[],this.metadata={},t&&this.parse(t)}return i(e,[{key:'parse',value:function(e){var t,n,a;if(!e)throw new Error('Package File Not Found');if(t=(0,o.qs)(e,'metadata'),!t)throw new Error('No Metadata Found');if(n=(0,o.qs)(e,'manifest'),!n)throw new Error('No Manifest Found');if(a=(0,o.qs)(e,'spine'),!a)throw new Error('No Spine Found');return this.manifest=this.parseManifest(n),this.navPath=this.findNavPath(n),this.ncxPath=this.findNcxPath(n,a),this.coverPath=this.findCoverPath(e),this.spineNodeIndex=(0,o.indexOfElementNode)(a),this.spine=this.parseSpine(a,this.manifest),this.metadata=this.parseMetadata(t),this.metadata.direction=a.getAttribute('page-progression-direction'),{metadata:this.metadata,spine:this.spine,manifest:this.manifest,navPath:this.navPath,ncxPath:this.ncxPath,coverPath:this.coverPath,spineNodeIndex:this.spineNodeIndex}}},{key:'parseMetadata',value:function(e){var t={title:this.getElementText(e,'title'),creator:this.getElementText(e,'creator'),description:this.getElementText(e,'description'),pubdate:this.getElementText(e,'date'),publisher:this.getElementText(e,'publisher'),identifier:this.getElementText(e,'identifier'),language:this.getElementText(e,'language'),rights:this.getElementText(e,'rights'),modified_date:this.getPropertyText(e,'dcterms:modified'),layout:this.getPropertyText(e,'rendition:layout'),orientation:this.getPropertyText(e,'rendition:orientation'),flow:this.getPropertyText(e,'rendition:flow'),viewport:this.getPropertyText(e,'rendition:viewport')};return t}},{key:'parseManifest',value:function(e){var t={},n=(0,o.qsa)(e,'item'),a=Array.prototype.slice.call(n);return a.forEach(function(e){var n=e.getAttribute('id'),a=e.getAttribute('href')||'',i=e.getAttribute('media-type')||'',o=e.getAttribute('properties')||'';t[n]={href:a,type:i,properties:o.length?o.split(' '):[]}}),t}},{key:'parseSpine',value:function(e){var t=[],n=(0,o.qsa)(e,'itemref'),a=Array.prototype.slice.call(n);return a.forEach(function(e,n){var a=e.getAttribute('idref'),i=e.getAttribute('properties')||'',o=i.length?i.split(' '):[],s={idref:a,linear:e.getAttribute('linear')||'yes',properties:o,index:n};t.push(s)}),t}},{key:'findNavPath',value:function(e){var t=(0,o.qsp)(e,'item',{properties:'nav'});return!!t&&t.getAttribute('href')}},{key:'findNcxPath',value:function(e,t){var n=(0,o.qsp)(e,'item',{"media-type":'application/x-dtbncx+xml'}),a;return n||(a=t.getAttribute('toc'),a&&(n=e.getElementById(a))),!!n&&n.getAttribute('href')}},{key:'findCoverPath',value:function(e){var t=(0,o.qs)(e,'package'),n=t.getAttribute('version');if('2.0'===n){var a=(0,o.qsp)(e,'meta',{name:'cover'});if(a){var i=a.getAttribute('content'),s=e.getElementById(i);return s?s.getAttribute('href'):''}return!1}var r=(0,o.qsp)(e,'item',{properties:'cover-image'});return r?r.getAttribute('href'):''}},{key:'getElementText',value:function(e,t){var n=e.getElementsByTagNameNS('http://purl.org/dc/elements/1.1/',t),a;return n&&0!==n.length?(a=n[0],a.childNodes.length?a.childNodes[0].nodeValue:''):''}},{key:'getPropertyText',value:function(e,t){var n=(0,o.qsp)(e,'meta',{property:t});return n&&n.childNodes.length?n.childNodes[0].nodeValue:''}},{key:'load',value:function(e){var t=this;return this.metadata=e.metadata,this.spine=e.spine.map(function(e,t){return e.index=t,e}),e.resources.forEach(function(e,n){t.manifest[n]=e,e.rel&&'cover'===e.rel[0]&&(t.coverPath=e.href)}),this.spineNodeIndex=0,this.toc=e.toc.map(function(e){return e.label=e.title,e}),{metadata:this.metadata,spine:this.spine,manifest:this.manifest,navPath:this.navPath,ncxPath:this.ncxPath,coverPath:this.coverPath,spineNodeIndex:this.spineNodeIndex,toc:this.toc}}},{key:'destroy',value:function(){this.manifest=void 0,this.navPath=void 0,this.ncxPath=void 0,this.coverPath=void 0,this.spineNodeIndex=void 0,this.spine=void 0,this.metadata=void 0}}]),e}();t.default=s,e.exports=t['default']},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var i=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),o=n(0),s=function(){function e(t){a(this,e),this.toc=[],this.tocByHref={},this.tocById={},this.landmarks=[],this.landmarksByType={},this.length=0,t&&this.parse(t)}return i(e,[{key:'parse',value:function(e){var t=e.nodeType,n,a;t&&(n=(0,o.qs)(e,'html'),a=(0,o.qs)(e,'ncx')),t?n?(this.toc=this.parseNav(e),this.landmarks=this.parseLandmarks(e)):a&&(this.toc=this.parseNcx(e)):this.toc=this.load(e),this.length=0,this.unpack(this.toc)}},{key:'unpack',value:function(e){for(var t=0,n;t<e.length;t++)n=e[t],n.href&&(this.tocByHref[n.href]=t),n.id&&(this.tocById[n.id]=t),this.length++,n.subitems.length&&this.unpack(n.subitems)}},{key:'get',value:function(e){var t;return e?(0===e.indexOf('#')?t=this.tocById[e.substring(1)]:e in this.tocByHref&&(t=this.tocByHref[e]),this.toc[t]):this.toc}},{key:'landmark',value:function(e){var t;return e?(t=this.landmarksByType[e],this.landmarks[t]):this.landmarks}},{key:'parseNav',value:function(e){var t=(0,o.querySelectorByType)(e,'nav','toc'),n=t?(0,o.qsa)(t,'li'):[],a=n.length,s={},r=[],l,i,d;if(!n||0===a)return r;for(l=0;l<a;++l)i=this.navItem(n[l]),i&&(s[i.id]=i,i.parent?(d=s[i.parent],d.subitems.push(i)):r.push(i));return r}},{key:'navItem',value:function(e){var t=e.getAttribute('id')||void 0,n=(0,o.filterChildren)(e,'a',!0);if(n){var a=n.getAttribute('href')||'',i=n.textContent||'',s=(0,o.getParentByTagName)(e,'li'),r;for(s&&(r=s.getAttribute('id'));!r&&s;)s=(0,o.getParentByTagName)(s,'li'),s&&(r=s.getAttribute('id'));return{id:t,href:a,label:i,subitems:[],parent:r}}}},{key:'parseLandmarks',value:function(e){var t=(0,o.querySelectorByType)(e,'nav','landmarks'),n=t?(0,o.qsa)(t,'li'):[],a=n.length,s=[],r,i;if(!n||0===a)return s;for(r=0;r<a;++r)i=this.landmarkItem(n[r]),i&&(s.push(i),this.landmarksByType[i.type]=r);return s}},{key:'landmarkItem',value:function(e){var t=(0,o.filterChildren)(e,'a',!0);if(t){var n=t.getAttributeNS('http://www.idpf.org/2007/ops','type')||void 0,a=t.getAttribute('href')||'',i=t.textContent||'';return{href:a,label:i,type:n}}}},{key:'parseNcx',value:function(e){var t=(0,o.qsa)(e,'navPoint'),n=t.length,a={},s=[],r,i,l;if(!t||0===n)return s;for(r=0;r<n;++r)i=this.ncxItem(t[r]),a[i.id]=i,i.parent?(l=a[i.parent],l.subitems.push(i)):s.push(i);return s}},{key:'ncxItem',value:function(e){var t=e.getAttribute('id')||!1,n=(0,o.qs)(e,'content'),a=n.getAttribute('src'),i=(0,o.qs)(e,'navLabel'),s=i.textContent?i.textContent:'',r=e.parentNode,l;return r&&'navPoint'===r.nodeName&&(l=r.getAttribute('id')),{id:t,href:a,label:s,subitems:[],parent:l}}},{key:'load',value:function(e){var t=this;return e.map(function(e){return e.label=e.title,e.children&&(e.subitems=t.load(e.children)),e})}},{key:'forEach',value:function(e){return this.toc.forEach(e)}}]),e}();t.default=s,e.exports=t['default']},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(7),r=n(0),l=n(5),d=a(l),u=n(17),c=a(u),p=n(4),h=a(p),g=n(6),f=a(g),m=function(){function e(t,n){i(this,e),this.settings={replacements:n&&n.replacements||'base64',archive:n&&n.archive,resolver:n&&n.resolver,request:n&&n.request},this.manifest=t,this.resources=Object.keys(t).map(function(e){return t[e]}),this.replacementUrls=[],this.html=[],this.assets=[],this.css=[],this.urls=[],this.cssUrls=[],this.split(),this.splitUrls()}return o(e,[{key:'split',value:function(){this.html=this.resources.filter(function(e){if('application/xhtml+xml'===e.type||'text/html'===e.type)return!0}),this.assets=this.resources.filter(function(e){if('application/xhtml+xml'!==e.type&&'text/html'!==e.type)return!0}),this.css=this.resources.filter(function(e){if('text/css'===e.type)return!0})}},{key:'splitUrls',value:function(){this.urls=this.assets.map(function(e){return e.href}.bind(this)),this.cssUrls=this.css.map(function(e){return e.href})}},{key:'createUrl',value:function(e){var t=new d.default(e),n=c.default.lookup(t.filename);return this.settings.archive?this.settings.archive.createUrl(e,{base64:'base64'===this.settings.replacements}):'base64'===this.settings.replacements?this.settings.request(e,'blob').then(function(e){return(0,r.blob2base64)(e)}).then(function(e){return(0,r.createBase64Url)(e,n)}):this.settings.request(e,'blob').then(function(e){return(0,r.createBlobUrl)(e,n)})}},{key:'replacements',value:function(){var e=this;if('none'===this.settings.replacements)return new Promise(function(e){e(this.urls)}.bind(this));var t=this.urls.map(function(t){var n=e.settings.resolver(t);return e.createUrl(n).catch(function(e){return console.error(e),null})});return Promise.all(t).then(function(t){return e.replacementUrls=t.filter(function(e){return'string'==typeof e}),t})}},{key:'replaceCss',value:function(e,t){var n=[];return e=e||this.settings.archive,t=t||this.settings.resolver,this.cssUrls.forEach(function(a){var i=this.createCssFile(a,e,t).then(function(e){var t=this.urls.indexOf(a);-1<t&&(this.replacementUrls[t]=e)}.bind(this));n.push(i)}.bind(this)),Promise.all(n)}},{key:'createCssFile',value:function(e){var t=this,n;if(f.default.isAbsolute(e))return new Promise(function(e){e()});var a=this.settings.resolver(e),i;i=this.settings.archive?this.settings.archive.getText(a):this.settings.request(a,'text');var o=this.urls.map(function(e){var n=t.settings.resolver(e),i=new h.default(a).relative(n);return i});return i?i.then(function(e){return e=(0,s.substitute)(e,o,t.replacementUrls),n='base64'===t.settings.replacements?(0,r.createBase64Url)(e,'text/css'):(0,r.createBlobUrl)(e,'text/css'),n},function(){return new Promise(function(e){e()})}):new Promise(function(e){e()})}},{key:'relativeTo',value:function(e,t){return t=t||this.settings.resolver,this.urls.map(function(n){var a=t(n),i=new h.default(e).relative(a);return i}.bind(this))}},{key:'get',value:function(e){var t=this.urls.indexOf(e);return-1===t?void 0:this.replacementUrls.length?new Promise(function(e){e(this.replacementUrls[t])}.bind(this)):this.createUrl(e)}},{key:'substitute',value:function(e,t){var n;return n=t?this.relativeTo(t):this.urls,(0,s.substitute)(e,n,this.replacementUrls)}},{key:'destroy',value:function(){this.settings=void 0,this.manifest=void 0,this.resources=void 0,this.replacementUrls=void 0,this.html=void 0,this.assets=void 0,this.css=void 0,this.urls=void 0,this.cssUrls=void 0}}]),e}();t.default=m,e.exports=t['default']},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(1),r=function(e){return e&&e.__esModule?e:{default:e}}(s),l=n(0),d=function(){function e(t){a(this,e),this.pages=[],this.locations=[],this.epubcfi=new r.default,this.firstPage=0,this.lastPage=0,this.totalPages=0,this.toc=void 0,this.ncx=void 0,t&&(this.pageList=this.parse(t)),this.pageList&&this.pageList.length&&this.process(this.pageList)}return o(e,[{key:'parse',value:function(e){var t=(0,l.qs)(e,'html'),n=(0,l.qs)(e,'ncx');return t?this.parseNav(e):void n}},{key:'parseNav',value:function(e){var t=(0,l.querySelectorByType)(e,'nav','page-list'),n=t?(0,l.qsa)(t,'li'):[],a=n.length,o=[],s,i;if(!n||0===a)return o;for(s=0;s<a;++s)i=this.item(n[s]),o.push(i);return o}},{key:'item',value:function(e){var t=(0,l.qs)(e,'a'),n=t.getAttribute('href')||'',a=t.textContent||'',i=parseInt(a),o=n.indexOf('epubcfi'),s,r,d;return-1==o?{href:n,page:i}:(s=n.split('#'),r=s[0],d=!!(1<s.length)&&s[1],{cfi:d,href:n,packageUrl:r,page:i})}},{key:'process',value:function(e){e.forEach(function(e){this.pages.push(e.page),e.cfi&&this.locations.push(e.cfi)},this),this.firstPage=parseInt(this.pages[0]),this.lastPage=parseInt(this.pages[this.pages.length-1]),this.totalPages=this.lastPage-this.firstPage}},{key:'pageFromCfi',value:function(e){var t=-1;if(0===this.locations.length)return-1;var n=(0,l.indexOfSorted)(e,this.locations,this.epubcfi.compare);return-1==n?(n=(0,l.locationOf)(e,this.locations,this.epubcfi.compare),t=0<=n-1?this.pages[n-1]:this.pages[0],void 0!==t||(t=-1)):t=this.pages[n],t}},{key:'cfiFromPage',value:function(e){var t=-1;'number'!=typeof e&&(e=parseInt(e));var n=this.pages.indexOf(e);return-1!=n&&(t=this.locations[n]),t}},{key:'pageFromPercentage',value:function(e){var t=i(this.totalPages*e);return t}},{key:'percentageFromPage',value:function(e){var t=(e-this.firstPage)/this.totalPages;return i(1e3*t)/1e3}},{key:'percentageFromCfi',value:function(e){var t=this.pageFromCfi(e),n=this.percentageFromPage(t);return n}},{key:'destroy',value:function(){this.pages=void 0,this.locations=void 0,this.epubcfi=void 0,this.pageList=void 0,this.toc=void 0,this.ncx=void 0}}]),e}();t.default=d,e.exports=t['default']},function(e,t,n){'use strict';function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),r=n(0),l=n(3),d=n(2),u=function(e){return e&&e.__esModule?e:{default:e}}(d),c=function(){function e(t){i(this,e),this.settings=t,this.name=t.layout||'reflowable',this._spread='none'!==t.spread,this._minSpreadWidth=t.minSpreadWidth||800,this._evenSpreads=t.evenSpreads||!1,this._flow='scrolled'===t.flow||'scrolled-continuous'===t.flow||'scrolled-doc'===t.flow?'scrolled':'paginated',this.width=0,this.height=0,this.spreadWidth=0,this.delta=0,this.columnWidth=0,this.gap=0,this.divisor=1,this.props={name:this.name,spread:this._spread,flow:this._flow,width:0,height:0,spreadWidth:0,delta:0,columnWidth:0,gap:0,divisor:1}}return o(e,[{key:'flow',value:function(e){return'undefined'!=typeof e&&(this._flow='scrolled'===e||'scrolled-continuous'===e||'scrolled-doc'===e?'scrolled':'paginated',this.update({flow:this._flow})),this._flow}},{key:'spread',value:function(e,t){return e&&(this._spread='none'!==e,this.update({spread:this._spread})),0<=t&&(this._minSpreadWidth=t),this._spread}},{key:'calculate',value:function(e,t,n){var a=1,i=n||0,o=e,r=t,l=s(o/12),d,u,c,p;a=this._spread&&o>=this._minSpreadWidth?2:1,'reflowable'!==this.name||'paginated'!==this._flow||0<=n||(i=0==l%2?l:l-1),'pre-paginated'===this.name&&(i=0),1<a?(d=o/a-i,c=d+i):(d=o,c=o),'pre-paginated'===this.name&&1<a&&(o=d),u=d*a+i,p=o,this.width=o,this.height=r,this.spreadWidth=u,this.pageWidth=c,this.delta=p,this.columnWidth=d,this.gap=i,this.divisor=a,this.update({width:o,height:r,spreadWidth:u,pageWidth:c,delta:p,columnWidth:d,gap:i,divisor:a})}},{key:'format',value:function(e){var t;return t='pre-paginated'===this.name?e.fit(this.columnWidth,this.height):'paginated'===this._flow?e.columns(this.width,this.height,this.columnWidth,this.gap):e.size(this.width,null),t}},{key:'count',value:function(e,t){var n,i;return'pre-paginated'===this.name?(n=1,i=1):'paginated'===this._flow?(t=t||this.delta,n=a(e/t),i=n*this.divisor):(t=t||this.height,n=a(e/t),i=n),{spreads:n,pages:i}}},{key:'update',value:function(e){var t=this;if(Object.keys(e).forEach(function(n){t.props[n]===e[n]&&delete e[n]}),0<Object.keys(e).length){var n=(0,r.extend)(this.props,e);this.emit(l.EVENTS.LAYOUT.UPDATED,n,e)}}}]),e}();(0,u.default)(c.prototype),t.default=c,e.exports=t['default']},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var i='function'==typeof Symbol&&'symbol'==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&'function'==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?'symbol':typeof e},o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(5),r=function(e){return e&&e.__esModule?e:{default:e}}(s),l=function(){function e(t){a(this,e),this.rendition=t,this._themes={default:{rules:{},url:'',serialized:''}},this._overrides={},this._current='default',this._injected=[],this.rendition.hooks.content.register(this.inject.bind(this)),this.rendition.hooks.content.register(this.overrides.bind(this))}return o(e,[{key:'register',value:function(){return 0===arguments.length?void 0:1===arguments.length&&'object'===i(arguments[0])?this.registerThemes(arguments[0]):1===arguments.length&&'string'==typeof arguments[0]?this.default(arguments[0]):2===arguments.length&&'string'==typeof arguments[1]?this.registerUrl(arguments[0],arguments[1]):2===arguments.length&&'object'===i(arguments[1])?this.registerRules(arguments[0],arguments[1]):void 0}},{key:'default',value:function(e){return e?'string'==typeof e?this.registerUrl('default',e):'object'===('undefined'==typeof e?'undefined':i(e))?this.registerRules('default',e):void 0:void 0}},{key:'registerThemes',value:function(e){for(var t in e)e.hasOwnProperty(t)&&('string'==typeof e[t]?this.registerUrl(t,e[t]):this.registerRules(t,e[t]))}},{key:'registerUrl',value:function(e,t){var n=new r.default(t);this._themes[e]={url:n.toString()},this._injected[e]&&this.update(e)}},{key:'registerRules',value:function(e,t){this._themes[e]={rules:t},this._injected[e]&&this.update(e)}},{key:'select',value:function(e){var t=this._current,n;this._current=e,this.update(e),n=this.rendition.getContents(),n.forEach(function(n){n.removeClass(t),n.addClass(e)})}},{key:'update',value:function(e){var t=this,n=this.rendition.getContents();n.forEach(function(n){t.add(e,n)})}},{key:'inject',value:function(e){var t=[],n=this._themes,a;for(var i in n)n.hasOwnProperty(i)&&(i===this._current||'default'==i)&&(a=n[i],(a.rules&&0<Object.keys(a.rules).length||a.url&&-1===t.indexOf(a.url))&&this.add(i,e),this._injected.push(i));'default'!=this._current&&e.addClass(this._current)}},{key:'add',value:function(e,t){var n=this._themes[e];n&&t&&(n.url?t.addStylesheet(n.url):n.serialized||n.rules&&(t.addStylesheetRules(n.rules),n.injected=!0))}},{key:'override',value:function(e,t){var n=this,a=this.rendition.getContents();this._overrides[e]=t,a.forEach(function(t){t.css(e,n._overrides[e])})}},{key:'overrides',value:function(e){var t=this._overrides;for(var n in t)t.hasOwnProperty(n)&&e.css(n,t[n])}},{key:'fontSize',value:function(e){this.override('font-size',e)}},{key:'font',value:function(e){this.override('font-family',e)}},{key:'destroy',value:function(){this.rendition=void 0,this._themes=void 0,this._overrides=void 0,this._current=void 0,this._injected=void 0}}]),e}();t.default=l,e.exports=t['default']},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(2),r=a(s),l=n(1),d=a(l),u=function(){function e(t){i(this,e),this.rendition=t,this.highlights=[],this.underlines=[],this.marks=[],this._annotations={},this._annotationsBySectionIndex={},this.rendition.hooks.render.register(this.inject.bind(this)),this.rendition.hooks.unloaded.register(this.clear.bind(this))}return o(e,[{key:'add',value:function(e,t,n,a){var i=encodeURI(t),o=new d.default(t),s=o.spinePos,r=new c({type:e,cfiRange:t,data:n,sectionIndex:s,cb:a});this._annotations[i]=r,s in this._annotationsBySectionIndex?this._annotationsBySectionIndex[s].push(i):this._annotationsBySectionIndex[s]=[i];var l=this.rendition.views();return l.forEach(function(e){r.sectionIndex===e.index&&r.attach(e)}),r}},{key:'remove',value:function(e,t){var n=this,a=encodeURI(e);if(a in this._annotations){var i=this._annotations[a];if(t&&i.type!==t)return;var o=this.rendition.views();o.forEach(function(e){n._removeFromAnnotationBySectionIndex(i.sectionIndex,a),i.sectionIndex===e.index&&i.detach(e)}),delete this._annotations[a]}}},{key:'_removeFromAnnotationBySectionIndex',value:function(e,t){this._annotationsBySectionIndex[e]=this._annotationsAt(e).filter(function(e){return e!==t})}},{key:'_annotationsAt',value:function(e){return this._annotationsBySectionIndex[e]}},{key:'highlight',value:function(e,t,n){this.add('highlight',e,t,n)}},{key:'underline',value:function(e,t,n){this.add('underline',e,t,n)}},{key:'mark',value:function(e,t,n){this.add('mark',e,t,n)}},{key:'each',value:function(){return this._annotations.forEach.apply(this._annotations,arguments)}},{key:'inject',value:function(e){var t=this,n=e.index;if(n in this._annotationsBySectionIndex){var a=this._annotationsBySectionIndex[n];a.forEach(function(n){var a=t._annotations[n];a.attach(e)})}}},{key:'clear',value:function(e){var t=this,n=e.index;if(n in this._annotationsBySectionIndex){var a=this._annotationsBySectionIndex[n];a.forEach(function(n){var a=t._annotations[n];a.detach(e)})}}},{key:'show',value:function(){}},{key:'hide',value:function(){}}]),e}(),c=function(){function e(t){var n=t.type,a=t.cfiRange,o=t.data,s=t.sectionIndex,r=t.cb;i(this,e),this.type=n,this.cfiRange=a,this.data=o,this.sectionIndex=s,this.mark=void 0,this.cb=r}return o(e,[{key:'update',value:function(e){this.data=e}},{key:'attach',value:function(e){var t=this.cfiRange,n=this.data,a=this.type,i=this.mark,o=this.cb,s;return'highlight'===a?s=e.highlight(t,n,o):'underline'===a?s=e.underline(t,n,o):'mark'===a&&(s=e.mark(t,n,o)),this.mark=s,s}},{key:'detach',value:function(e){var t=this.cfiRange,n=this.type,a;return e&&('highlight'===n?a=e.unhighlight(t):'underline'===n?a=e.ununderline(t):'mark'===n&&(a=e.unmark(t))),this.mark=void 0,a}},{key:'text',value:function(){}}]),e}();(0,r.default)(c.prototype),t.default=u,e.exports=t['default']},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!e)throw new ReferenceError('this hasn\'t been initialised - super() hasn\'t been called');return t&&('object'===('undefined'==typeof t?'undefined':u(t))||'function'==typeof t)?t:e}function o(e,t){if('function'!=typeof t&&null!==t)throw new TypeError('Super expression must either be null or a function, not '+('undefined'==typeof t?'undefined':u(t)));e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}function r(e,t){var n=t.getBoundingClientRect(),a=e.getBoundingClientRect();return{top:a.top-n.top,left:a.left-n.left,height:e.scrollHeight,width:e.scrollWidth}}function l(e,t){e.style.top=t.top+'px',e.style.left=t.left+'px',e.style.height=t.height+'px',e.style.width=t.width+'px'}function d(e,t){return t.right<=e.right&&t.left>=e.left&&t.top>=e.top&&t.bottom<=e.bottom}var u='function'==typeof Symbol&&'symbol'==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&'function'==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?'symbol':typeof e};Object.defineProperty(t,'__esModule',{value:!0}),t.Underline=t.Highlight=t.Mark=t.Pane=void 0;var c=function e(t,n,a){null===t&&(t=Function.prototype);var i=Object.getOwnPropertyDescriptor(t,n);if(i===void 0){var o=Object.getPrototypeOf(t);return null===o?void 0:e(o,n,a)}if('value'in i)return i.value;var s=i.get;return void 0===s?void 0:s.call(a)},p=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),h=n(54),f=a(h),g=n(55),m=a(g),y=t.Pane=function(){function e(t){var n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:document.body;s(this,e),this.target=t,this.element=f.default.createElement('svg'),this.marks=[],this.element.style.position='absolute',this.element.setAttribute('pointer-events','none'),m.default.proxyMouse(this.target,this.marks),this.container=n,this.container.appendChild(this.element),this.render()}return p(e,[{key:'addMark',value:function(e){var t=f.default.createElement('g');return this.element.appendChild(t),e.bind(t,this.container),this.marks.push(e),e.render(),e}},{key:'removeMark',value:function(e){var t=this.marks.indexOf(e);if(-1!==t){var n=e.unbind();this.element.removeChild(n),this.marks.splice(t,1)}}},{key:'render',value:function(){l(this.element,r(this.target,this.container));var e=!0,t=!1,n;try{for(var a=this.marks[Symbol.iterator](),i,o;!(e=(i=a.next()).done);e=!0)o=i.value,o.render()}catch(e){t=!0,n=e}finally{try{!e&&a.return&&a.return()}finally{if(t)throw n}}}}]),e}(),v=t.Mark=function(){function e(){s(this,e),this.element=null}return p(e,[{key:'bind',value:function(e,t){this.element=e,this.container=t}},{key:'unbind',value:function(){var e=this.element;return this.element=null,e}},{key:'render',value:function(){}},{key:'dispatchEvent',value:function(t){this.element&&this.element.dispatchEvent(t)}},{key:'getBoundingClientRect',value:function(){return this.element.getBoundingClientRect()}},{key:'getClientRects',value:function(){for(var e=[],t=this.element.firstChild;t;)e.push(t.getBoundingClientRect()),t=t.nextSibling;return e}},{key:'filteredRanges',value:function(){var e=Array.from(this.range.getClientRects());return e.filter(function(t){for(var n=0;n<e.length;n++){if(e[n]===t)return!0;var a=d(e[n],t);if(a)return!1}return!0})}}]),e}(),b=t.Highlight=function(e){function t(e,n,a,o){s(this,t);var r=i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return r.range=e,r.className=n,r.data=a||{},r.attributes=o||{},r}return o(t,e),p(t,[{key:'bind',value:function(e,n){for(var a in c(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),'bind',this).call(this,e,n),this.data)this.data.hasOwnProperty(a)&&(this.element.dataset[a]=this.data[a]);for(var a in this.attributes)this.attributes.hasOwnProperty(a)&&this.element.setAttribute(a,this.attributes[a]);this.className&&this.element.classList.add(this.className)}},{key:'render',value:function(){for(;this.element.firstChild;)this.element.removeChild(this.element.firstChild);for(var e=this.element.ownerDocument.createDocumentFragment(),t=this.filteredRanges(),n=this.element.getBoundingClientRect(),a=this.container.getBoundingClientRect(),o=0,i=t.length;o<i;o++){var s=t[o],r=f.default.createElement('rect');r.setAttribute('x',s.left-n.left+a.left),r.setAttribute('y',s.top-n.top+a.top),r.setAttribute('height',s.height),r.setAttribute('width',s.width),e.appendChild(r)}this.element.appendChild(e)}}]),t}(v),k=t.Underline=function(e){function t(e,n,a,o){return s(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,n,a,o))}return o(t,e),p(t,[{key:'render',value:function(){for(;this.element.firstChild;)this.element.removeChild(this.element.firstChild);for(var e=this.element.ownerDocument.createDocumentFragment(),t=this.filteredRanges(),n=this.element.getBoundingClientRect(),a=this.container.getBoundingClientRect(),o=0,i=t.length;o<i;o++){var s=t[o],r=f.default.createElement('rect');r.setAttribute('x',s.left-n.left+a.left),r.setAttribute('y',s.top-n.top+a.top),r.setAttribute('height',s.height),r.setAttribute('width',s.width),r.setAttribute('fill','none');var l=f.default.createElement('line');l.setAttribute('x1',s.left-n.left+a.left),l.setAttribute('x2',s.left-n.left+a.left+s.width),l.setAttribute('y1',s.top-n.top+a.top+s.height-1),l.setAttribute('y2',s.top-n.top+a.top+s.height-1),l.setAttribute('stroke-width',1),l.setAttribute('stroke','black'),l.setAttribute('stroke-linecap','square'),e.appendChild(r),e.appendChild(l)}this.element.appendChild(e)}}]),t}(b)},function(e,t){'use strict';function n(e){return document.createElementNS('http://www.w3.org/2000/svg',e)}Object.defineProperty(t,'__esModule',{value:!0}),t.createElement=n,t.default={createElement:n}},function(e,t){'use strict';function n(n,s){function t(r){for(var e=s.length-1;0<=e;e--){var i=s[e],t=r.clientX,l=r.clientY;if(r.touches&&r.touches.length&&(t=r.touches[0].clientX,l=r.touches[0].clientY),!!o(i,n,t,l)){i.dispatchEvent(a(r));break}}}if('iframe'===n.nodeName||'IFRAME'===n.nodeName)try{this.target=n.contentDocument}catch(e){this.target=n}else this.target=n;for(var e=['mouseup','mousedown','click','touchstart'],i=0,r;i<e.length;i++)r=e[i],this.target.addEventListener(r,function(n){return t(n)},!1)}function a(t){var e=Object.assign({},t,{bubbles:!1});try{return new MouseEvent(t.type,e)}catch(a){var n=document.createEvent('MouseEvents');return n.initMouseEvent(t.type,!1,e.cancelable,e.view,e.detail,e.screenX,e.screenY,e.clientX,e.clientY,e.ctrlKey,e.altKey,e.shiftKey,e.metaKey,e.button,e.relatedTarget),n}}function o(e,t,n,a){function o(e,t,n){var a=e.top-s.top,i=e.left-s.left,o=a+e.height,r=i+e.width;return a<=n&&i<=t&&o>n&&r>t}var s=t.getBoundingClientRect(),r=e.getBoundingClientRect();if(!o(r,n,a))return!1;for(var l=e.getClientRects(),d=0,i=l.length;d<i;d++)if(o(l[d],n,a))return!0;return!1}Object.defineProperty(t,'__esModule',{value:!0}),t.proxyMouse=n,t.clone=a,t.default={proxyMouse:n}},function(e,t,n){'use strict';function a(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var i=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),o=n(0),s=n(57),r=function(e){return e&&e.__esModule?e:{default:e}}(s),l=function(){function e(t){a(this,e),this.settings=t||{},this.id='epubjs-container-'+(0,o.uuid)(),this.container=this.create(this.settings),this.settings.hidden&&(this.wrapper=this.wrap(this.container))}return i(e,[{key:'create',value:function(e){var t=e.height,n=e.width,a=e.overflow||!1,i=e.axis||'vertical',s=e.direction;e.height&&(0,o.isNumber)(e.height)&&(t=e.height+'px'),e.width&&(0,o.isNumber)(e.width)&&(n=e.width+'px');var r=document.createElement('div');return r.id=this.id,r.classList.add('epub-container'),r.style.wordSpacing='0',r.style.lineHeight='0',r.style.verticalAlign='top',r.style.position='relative','horizontal'===i&&(r.style.display='flex',r.style.flexDirection='row',r.style.flexWrap='nowrap'),n&&(r.style.width=n),t&&(r.style.height=t),a&&(r.style.overflow=a),s&&(r.dir=s,r.style.direction=s),s&&this.settings.fullsize&&(document.body.style.direction=s),r}},{key:'wrap',value:function(e){var t=document.createElement('div');return t.style.visibility='hidden',t.style.overflow='hidden',t.style.width='0',t.style.height='0',t.appendChild(e),t}},{key:'getElement',value:function(e){var t;if((0,o.isElement)(e)?t=e:'string'==typeof e&&(t=document.getElementById(e)),!t)throw new Error('Not an Element');return t}},{key:'attachTo',value:function(e){var t=this.getElement(e),n;if(t)return n=this.settings.hidden?this.wrapper:this.container,t.appendChild(n),this.element=t,t}},{key:'getContainer',value:function(){return this.container}},{key:'onResize',value:function(e){(0,o.isNumber)(this.settings.width)&&(0,o.isNumber)(this.settings.height)||(this.resizeFunc=(0,r.default)(e,50),window.addEventListener('resize',this.resizeFunc,!1))}},{key:'onOrientationChange',value:function(e){this.orientationChangeFunc=e,window.addEventListener('orientationchange',this.orientationChangeFunc,!1)}},{key:'size',value:function(e,t){var n;null===e&&(n=this.element.getBoundingClientRect(),n.width&&(e=n.width,this.container.style.width=n.width+'px')),null===t&&(n=n||this.element.getBoundingClientRect(),n.height&&(t=n.height,this.container.style.height=n.height+'px')),(0,o.isNumber)(e)||(n=this.container.getBoundingClientRect(),e=n.width),(0,o.isNumber)(t)||(n=n||this.container.getBoundingClientRect(),t=n.height),this.containerStyles=window.getComputedStyle(this.container),this.containerPadding={left:parseFloat(this.containerStyles['padding-left'])||0,right:parseFloat(this.containerStyles['padding-right'])||0,top:parseFloat(this.containerStyles['padding-top'])||0,bottom:parseFloat(this.containerStyles['padding-bottom'])||0};var a=(0,o.windowBounds)();return e||(e=a.width),(this.settings.fullsize||!t)&&(t=a.height),{width:e-this.containerPadding.left-this.containerPadding.right,height:t-this.containerPadding.top-this.containerPadding.bottom}}},{key:'bounds',value:function(){var e;return'visible'!==this.container.style.overflow&&(e=this.container&&this.container.getBoundingClientRect()),e&&e.width&&e.height?e:(0,o.windowBounds)()}},{key:'getSheet',value:function(){var e=document.createElement('style');return e.appendChild(document.createTextNode('')),document.head.appendChild(e),e.sheet}},{key:'addStyleRules',value:function(e,t){var n='#'+this.id+' ',a='';this.sheet||(this.sheet=this.getSheet()),t.forEach(function(e){for(var t in e)e.hasOwnProperty(t)&&(a+=t+':'+e[t]+';')}),this.sheet.insertRule(n+e+' {'+a+'}',0)}},{key:'axis',value:function(e){'horizontal'===e?(this.container.style.display='flex',this.container.style.flexDirection='row',this.container.style.flexWrap='nowrap'):this.container.style.display='block'}},{key:'direction',value:function(e){this.container&&(this.container.dir=e,this.container.style.direction=e),this.settings.fullsize&&(document.body.style.direction=e)}},{key:'destroy',value:function(){var e;this.element&&(e=this.settings.hidden?this.wrapper:this.container,this.element.contains(this.container)&&this.element.removeChild(this.container),window.removeEventListener('resize',this.resizeFunc),window.removeEventListener('orientationChange',this.orientationChangeFunc))}}]),e}();t.default=l,e.exports=t['default']},function(e,t,n){var a=n(21),i=n(15);e.exports=function(e,t,n){var o=!0,s=!0;if('function'!=typeof e)throw new TypeError('Expected a function');return i(n)&&(o='leading'in n?!!n.leading:o,s='trailing'in n?!!n.trailing:s),a(e,t,{leading:o,maxWait:t,trailing:s})}},function(e,t,n){var a=n(22);e.exports=function(){return a.Date.now()}},function(e,t,n){(function(t){var n='object'==typeof t&&t&&t.Object===Object&&t;e.exports=n}).call(t,n(8))},function(e,t,n){var a=n(15),i=n(61),o=0/0,s=/^\s+|\s+$/g,r=/^[-+]0x[0-9a-f]+$/i,l=/^0b[01]+$/i,d=/^0o[0-7]+$/i,u=parseInt;e.exports=function(e){if('number'==typeof e)return e;if(i(e))return o;if(a(e)){var t='function'==typeof e.valueOf?e.valueOf():e;e=a(t)?t+'':t}if('string'!=typeof e)return 0===e?e:+e;e=e.replace(s,'');var n=l.test(e);return n||d.test(e)?u(e.slice(2),n?2:8):r.test(e)?o:+e}},function(e,t,n){var a=n(62),i=n(65);e.exports=function(e){return'symbol'==typeof e||i(e)&&a(e)=='[object Symbol]'}},function(e,t,n){var a=n(23),i=n(63),o=n(64),s=a?a.toStringTag:void 0;e.exports=function(e){return null==e?void 0===e?'[object Undefined]':'[object Null]':s&&s in Object(e)?i(e):o(e)}},function(e,t,n){var a=n(23),i=Object.prototype,o=i.hasOwnProperty,s=i.toString,r=a?a.toStringTag:void 0;e.exports=function(e){var t=o.call(e,r),n=e[r];try{e[r]=void 0}catch(t){}var a=s.call(e);return t?e[r]=n:delete e[r],a}},function(e){var t=Object.prototype,n=t.toString;e.exports=function(e){return n.call(e)}},function(e){e.exports=function(e){return null!=e&&'object'==typeof e}},function(e,t){'use strict';function n(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var a=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),i=function(){function e(t){n(this,e),this.container=t,this._views=[],this.length=0,this.hidden=!1}return a(e,[{key:'all',value:function(){return this._views}},{key:'first',value:function(){return this._views[0]}},{key:'last',value:function(){return this._views[this._views.length-1]}},{key:'indexOf',value:function(e){return this._views.indexOf(e)}},{key:'slice',value:function(){return this._views.slice.apply(this._views,arguments)}},{key:'get',value:function(e){return this._views[e]}},{key:'append',value:function(e){return this._views.push(e),this.container&&this.container.appendChild(e.element),this.length++,e}},{key:'prepend',value:function(e){return this._views.unshift(e),this.container&&this.container.insertBefore(e.element,this.container.firstChild),this.length++,e}},{key:'insert',value:function(e,t){return this._views.splice(t,0,e),this.container&&(t<this.container.children.length?this.container.insertBefore(e.element,this.container.children[t]):this.container.appendChild(e.element)),this.length++,e}},{key:'remove',value:function(e){var t=this._views.indexOf(e);-1<t&&this._views.splice(t,1),this.destroy(e),this.length--}},{key:'destroy',value:function(e){e.displayed&&e.destroy(),this.container&&this.container.removeChild(e.element),e=null}},{key:'forEach',value:function(){return this._views.forEach.apply(this._views,arguments)}},{key:'clear',value:function(){var e=this.length,t;if(this.length){for(var n=0;n<e;n++)t=this._views[n],this.destroy(t);this._views=[],this.length=0}}},{key:'find',value:function(e){for(var t=this.length,n=0,a;n<t;n++)if(a=this._views[n],a.displayed&&a.section.index==e.index)return a}},{key:'displayed',value:function(){for(var e=[],t=this.length,n=0,a;n<t;n++)a=this._views[n],a.displayed&&e.push(a);return e}},{key:'show',value:function(){for(var e=this.length,t=0,n;t<e;t++)n=this._views[t],n.displayed&&n.show();this.hidden=!1}},{key:'hide',value:function(){for(var e=this.length,t=0,n;t<e;t++)n=this._views[t],n.displayed&&n.hide();this.hidden=!0}}]),e}();t.default=i,e.exports=t['default']},function(e,t,n){'use strict';function a(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')}Object.defineProperty(t,'__esModule',{value:!0});var o=function(){function e(e,t){for(var n=0,a;n<t.length;n++)a=t[n],a.enumerable=a.enumerable||!1,a.configurable=!0,'value'in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),s=n(0),r=n(11),l=a(r),d=n(17),u=a(d),c=n(4),p=a(c),h=function(){function e(){i(this,e),this.zip=void 0,this.urlCache={},this.checkRequirements()}return o(e,[{key:'checkRequirements',value:function(){try{if('undefined'==typeof JSZip){var e=n(68);this.zip=new e}else this.zip=new JSZip}catch(t){throw new Error('JSZip lib not loaded')}}},{key:'open',value:function(e,t){return this.zip.loadAsync(e,{base64:t})}},{key:'openUrl',value:function(e,t){return(0,l.default)(e,'binary').then(function(e){return this.zip.loadAsync(e,{base64:t})}.bind(this))}},{key:'request',value:function(e,t){var n=new s.defer,a=new p.default(e),i;return t||(t=a.extension),i='blob'==t?this.getBlob(e):this.getText(e),i?i.then(function(e){var a=this.handleResponse(e,t);n.resolve(a)}.bind(this)):n.reject({message:'File not found in the epub: '+e,stack:new Error().stack}),n.promise}},{key:'handleResponse',value:function(e,t){var n;return n='json'==t?JSON.parse(e):(0,s.isXml)(t)?(0,s.parse)(e,'text/xml'):'xhtml'==t?(0,s.parse)(e,'application/xhtml+xml'):'html'==t||'htm'==t?(0,s.parse)(e,'text/html'):e,n}},{key:'getBlob',value:function(e,t){var n=window.decodeURIComponent(e.substr(1)),a=this.zip.file(n);if(a)return t=t||u.default.lookup(a.name),a.async('uint8array').then(function(e){return new Blob([e],{type:t})})}},{key:'getText',value:function(e){var t=window.decodeURIComponent(e.substr(1)),n=this.zip.file(t);if(n)return n.async('string').then(function(e){return e})}},{key:'getBase64',value:function(e,t){var n=window.decodeURIComponent(e.substr(1)),a=this.zip.file(n);if(a)return t=t||u.default.lookup(a.name),a.async('base64').then(function(e){return'data:'+t+';base64,'+e})}},{key:'createUrl',value:function(e,t){var n=new s.defer,a=window.URL||window.webkitURL||window.mozURL,i=t&&t.base64,o,r;return e in this.urlCache?(n.resolve(this.urlCache[e]),n.promise):(i?(r=this.getBase64(e),r&&r.then(function(t){this.urlCache[e]=t,n.resolve(t)}.bind(this))):(r=this.getBlob(e),r&&r.then(function(t){o=a.createObjectURL(t),this.urlCache[e]=o,n.resolve(o)}.bind(this))),r||n.reject({message:'File not found in the epub: '+e,stack:new Error().stack}),n.promise)}},{key:'revokeUrl',value:function(e){var t=window.URL||window.webkitURL||window.mozURL,n=this.urlCache[e];n&&t.revokeObjectURL(n)}},{key:'destroy',value:function(){var e=window.URL||window.webkitURL||window.mozURL;for(var t in this.urlCache)e.revokeObjectURL(t);this.zip=void 0,this.urlCache={}}}]),e}();t.default=h,e.exports=t['default']},function(n){if('undefined'==typeof t){var a=new Error('Cannot find module "jszip"');throw a.code='MODULE_NOT_FOUND',a}n.exports=t},function(e,t,n){'use strict';(function(e,n){var a='function'==typeof Symbol&&'symbol'==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&'function'==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?'symbol':typeof e},i,o,s;(function(r,l){r||(r=window||e),'object'===a(n)&&n.exports?n.exports=l(r):(o=[],i=l,s='function'==typeof i?i.apply(t,o):i,!(s!==void 0&&(n.exports=s)))})(void 0,function(e){function t(e){return void 0!==u[e]}function n(){r.call(this),this._isInvalid=!0}function a(e){return''==e&&n.call(this),e.toLowerCase()}function o(e){var t=e.charCodeAt(0);return 32<t&&127>t&&-1==[34,35,60,62,63,96].indexOf(t)?e:encodeURIComponent(e)}function s(e){var t=e.charCodeAt(0);return 32<t&&127>t&&-1==[34,35,60,62,96].indexOf(t)?e:encodeURIComponent(e)}function i(e,r,l){function d(e){x.push(e)}var m=r||'scheme start',y=0,v='',b=!1,k=!1,x=[];loop:for(;(e[y-1]!=f||0==y)&&!this._isInvalid;){var E=e[y];switch(m){case'scheme start':if(E&&h.test(E))v+=E.toLowerCase(),m='scheme';else if(!r){v='',m='no scheme';continue}else{d('Invalid scheme.');break loop}break;case'scheme':if(E&&g.test(E))v+=E.toLowerCase();else if(':'==E){if(this._scheme=v,v='',r)break loop;t(this._scheme)&&(this._isRelative=!0),m='file'==this._scheme?'relative':this._isRelative&&l&&l._scheme==this._scheme?'relative or authority':this._isRelative?'authority first slash':'scheme data'}else if(!r){v='',y=0,m='no scheme';continue}else if(f==E)break loop;else{d('Code point not allowed in scheme: '+E);break loop}break;case'scheme data':'?'==E?(this._query='?',m='query'):'#'==E?(this._fragment='#',m='fragment'):f!=E&&'\t'!=E&&'\n'!=E&&'\r'!=E&&(this._schemeData+=o(E));break;case'no scheme':if(!l||!t(l._scheme))d('Missing scheme.'),n.call(this);else{m='relative';continue}break;case'relative or authority':if('/'==E&&'/'==e[y+1])m='authority ignore slashes';else{d('Expected /, got: '+E),m='relative';continue}break;case'relative':if(this._isRelative=!0,'file'!=this._scheme&&(this._scheme=l._scheme),f==E){this._host=l._host,this._port=l._port,this._path=l._path.slice(),this._query=l._query,this._username=l._username,this._password=l._password;break loop}else if('/'==E||'\\'==E)'\\'==E&&d('\\ is an invalid code point.'),m='relative slash';else if('?'==E)this._host=l._host,this._port=l._port,this._path=l._path.slice(),this._query='?',this._username=l._username,this._password=l._password,m='query';else if('#'==E)this._host=l._host,this._port=l._port,this._path=l._path.slice(),this._query=l._query,this._fragment='#',this._username=l._username,this._password=l._password,m='fragment';else{var c=e[y+1],_=e[y+2];'file'==this._scheme&&h.test(E)&&(':'==c||'|'==c)&&(f==_||'/'==_||'\\'==_||'?'==_||'#'==_)||(this._host=l._host,this._port=l._port,this._username=l._username,this._password=l._password,this._path=l._path.slice(),this._path.pop()),m='relative path';continue}break;case'relative slash':if('/'==E||'\\'==E)'\\'==E&&d('\\ is an invalid code point.'),m='file'==this._scheme?'file host':'authority ignore slashes';else{'file'!=this._scheme&&(this._host=l._host,this._port=l._port,this._username=l._username,this._password=l._password),m='relative path';continue}break;case'authority first slash':if('/'==E)m='authority second slash';else{d('Expected \'/\', got: '+E),m='authority ignore slashes';continue}break;case'authority second slash':if(m='authority ignore slashes','/'!=E){d('Expected \'/\', got: '+E);continue}break;case'authority ignore slashes':if('/'!=E&&'\\'!=E){m='authority';continue}else d('Expected authority, got: '+E);break;case'authority':if('@'==E){b&&(d('@ already seen.'),v+='%40'),b=!0;for(var w=0,i;w<v.length;w++){if(i=v[w],'\t'==i||'\n'==i||'\r'==i){d('Invalid whitespace in authority.');continue}if(':'==i&&null===this._password){this._password='';continue}var S=o(i);null===this._password?this._username+=S:this._password+=S}v=''}else if(f==E||'/'==E||'\\'==E||'?'==E||'#'==E){y-=v.length,v='',m='host';continue}else v+=E;break;case'file host':if(f==E||'/'==E||'\\'==E||'?'==E||'#'==E){2==v.length&&h.test(v[0])&&(':'==v[1]||'|'==v[1])?m='relative path':0==v.length?m='relative path start':(this._host=a.call(this,v),v='',m='relative path start');continue}else'\t'==E||'\n'==E||'\r'==E?d('Invalid whitespace in file host.'):v+=E;break;case'host':case'hostname':if(':'==E&&!k){if(this._host=a.call(this,v),v='',m='port','hostname'==r)break loop;}else if(f==E||'/'==E||'\\'==E||'?'==E||'#'==E){if(this._host=a.call(this,v),v='',m='relative path start',r)break loop;continue}else'\t'!=E&&'\n'!=E&&'\r'!=E?('['==E?k=!0:']'==E&&(k=!1),v+=E):d('Invalid code point in host/hostname: '+E);break;case'port':if(/[0-9]/.test(E))v+=E;else if(f==E||'/'==E||'\\'==E||'?'==E||'#'==E||r){if(''!=v){var C=parseInt(v,10);C!=u[this._scheme]&&(this._port=C+''),v=''}if(r)break loop;m='relative path start';continue}else'\t'==E||'\n'==E||'\r'==E?d('Invalid code point in port: '+E):n.call(this);break;case'relative path start':if('\\'==E&&d('\'\\\' not allowed in path.'),m='relative path','/'!=E&&'\\'!=E)continue;break;case'relative path':if(f==E||'/'==E||'\\'==E||!r&&('?'==E||'#'==E)){'\\'==E&&d('\\ not allowed in relative path.');var T;(T=p[v.toLowerCase()])&&(v=T),'..'==v?(this._path.pop(),'/'!=E&&'\\'!=E&&this._path.push('')):'.'==v&&'/'!=E&&'\\'!=E?this._path.push(''):'.'!=v&&('file'==this._scheme&&0==this._path.length&&2==v.length&&h.test(v[0])&&'|'==v[1]&&(v=v[0]+':'),this._path.push(v)),v='','?'==E?(this._query='?',m='query'):'#'==E&&(this._fragment='#',m='fragment')}else'\t'!=E&&'\n'!=E&&'\r'!=E&&(v+=o(E));break;case'query':r||'#'!=E?f!=E&&'\t'!=E&&'\n'!=E&&'\r'!=E&&(this._query+=s(E)):(this._fragment='#',m='fragment');break;case'fragment':f!=E&&'\t'!=E&&'\n'!=E&&'\r'!=E&&(this._fragment+=E);}y++}}function r(){this._scheme='',this._schemeData='',this._username='',this._password=null,this._host='',this._port='',this._path=[],this._query='',this._fragment='',this._isInvalid=!1,this._isRelative=!1}function l(e,t){void 0===t||t instanceof l||(t=new l(t+'')),this._url=e,r.call(this);var n=e.replace(/^[ \t\r\n\f]+|[ \t\r\n\f]+$/g,'');i.call(this,n,null,t)}var d=!1;if(!e.forceJURL)try{var c=new URL('b','http://a');c.pathname='c%20d',d='http://a/c%20d'===c.href}catch(t){}if(d)return e.URL;var u=Object.create(null);u.ftp=21,u.file=0,u.gopher=70,u.http=80,u.https=443,u.ws=80,u.wss=443;var p=Object.create(null);p['%2e']='.',p['.%2e']='..',p['%2e.']='..',p['%2e%2e']='..';var h=/[a-zA-Z]/,g=/[a-zA-Z0-9\+\-\.]/,f;l.prototype={toString:function(){return this.href},get href(){if(this._isInvalid)return this._url;var e='';return(''!=this._username||null!=this._password)&&(e=this._username+(null==this._password?'':':'+this._password)+'@'),this.protocol+(this._isRelative?'//'+e+this.host:'')+this.pathname+this._query+this._fragment},set href(e){r.call(this),i.call(this,e)},get protocol(){return this._scheme+':'},set protocol(e){this._isInvalid||i.call(this,e+':','scheme start')},get host(){return this._isInvalid?'':this._port?this._host+':'+this._port:this._host},set host(e){this._isInvalid||!this._isRelative||i.call(this,e,'host')},get hostname(){return this._host},set hostname(e){this._isInvalid||!this._isRelative||i.call(this,e,'hostname')},get port(){return this._port},set port(e){this._isInvalid||!this._isRelative||i.call(this,e,'port')},get pathname(){return this._isInvalid?'':this._isRelative?'/'+this._path.join('/'):this._schemeData},set pathname(e){this._isInvalid||!this._isRelative||(this._path=[],i.call(this,e,'relative path start'))},get search(){return this._isInvalid||!this._query||'?'==this._query?'':this._query},set search(e){this._isInvalid||!this._isRelative||(this._query='?','?'==e[0]&&(e=e.slice(1)),i.call(this,e,'query'))},get hash(){return this._isInvalid||!this._fragment||'#'==this._fragment?'':this._fragment},set hash(e){this._isInvalid||(this._fragment='#','#'==e[0]&&(e=e.slice(1)),i.call(this,e,'fragment'))},get origin(){var e;if(this._isInvalid||!this._scheme)return'';switch(this._scheme){case'file':return'file://';case'data':case'javascript':case'mailto':return'null';}return e=this.host,e?this._scheme+'://'+e:''}};var m=e.URL;return m&&(l.createObjectURL=function(){return m.createObjectURL.apply(m,arguments)},l.revokeObjectURL=function(e){m.revokeObjectURL(e)}),l})}).call(t,n(8),n(70)(e))},function(e){e.exports=function(e){return e.webpackPolyfill||(e.deprecate=function(){},e.paths=[],!e.children&&(e.children=[]),Object.defineProperty(e,'loaded',{enumerable:!0,get:function(){return e.l}}),Object.defineProperty(e,'id',{enumerable:!0,get:function(){return e.i}}),e.webpackPolyfill=1),e}}])});
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("xmldom"),require("JSZip")):"function"==typeof define&&define.amd?define(["xmldom","JSZip"],e):"object"==typeof exports?exports.ePub=e(require("xmldom"),require("JSZip")):t.ePub=e(t.xmldom,t.JSZip)}(window,(function(t,e){return function(t){var e={};function i(n){if(e[n])return e[n].exports;var r=e[n]={i:n,l:!1,exports:{}};return t[n].call(r.exports,r,r.exports,i),r.l=!0,r.exports}return i.m=t,i.c=e,i.d=function(t,e,n){i.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},i.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},i.t=function(t,e){if(1&e&&(t=i(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)i.d(n,r,function(e){return t[e]}.bind(null,r));return n},i.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return i.d(e,"a",e),e},i.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},i.p="/dist/",i(i.s=86)}([function(t,e,i){"use strict";i.r(e),i.d(e,"requestAnimationFrame",(function(){return r})),i.d(e,"uuid",(function(){return o})),i.d(e,"documentHeight",(function(){return a})),i.d(e,"isElement",(function(){return h})),i.d(e,"isNumber",(function(){return l})),i.d(e,"isFloat",(function(){return c})),i.d(e,"prefixed",(function(){return u})),i.d(e,"defaults",(function(){return d})),i.d(e,"extend",(function(){return f})),i.d(e,"insert",(function(){return p})),i.d(e,"locationOf",(function(){return g})),i.d(e,"indexOfSorted",(function(){return v})),i.d(e,"bounds",(function(){return m})),i.d(e,"borders",(function(){return y})),i.d(e,"nodeBounds",(function(){return b})),i.d(e,"windowBounds",(function(){return w})),i.d(e,"indexOfNode",(function(){return x})),i.d(e,"indexOfTextNode",(function(){return E})),i.d(e,"indexOfElementNode",(function(){return S})),i.d(e,"isXml",(function(){return _})),i.d(e,"createBlob",(function(){return O})),i.d(e,"createBlobUrl",(function(){return C})),i.d(e,"revokeBlobUrl",(function(){return T})),i.d(e,"createBase64Url",(function(){return k})),i.d(e,"type",(function(){return R})),i.d(e,"parse",(function(){return L})),i.d(e,"qs",(function(){return I})),i.d(e,"qsa",(function(){return j})),i.d(e,"qsp",(function(){return N})),i.d(e,"sprint",(function(){return A})),i.d(e,"treeWalker",(function(){return P})),i.d(e,"walk",(function(){return D})),i.d(e,"blob2base64",(function(){return z})),i.d(e,"defer",(function(){return B})),i.d(e,"querySelectorByType",(function(){return q})),i.d(e,"findChildren",(function(){return M})),i.d(e,"parents",(function(){return U})),i.d(e,"filterChildren",(function(){return F})),i.d(e,"getParentByTagName",(function(){return W})),i.d(e,"RangeObject",(function(){return H}));i(24),i(14),i(20);var n=i(38);const r="undefined"!=typeof window&&(window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame),s="undefined"!=typeof URL?URL:"undefined"!=typeof window?window.URL||window.webkitURL||window.mozURL:void 0;function o(){var t=(new Date).getTime();return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var i=(t+16*Math.random())%16|0;return t=Math.floor(t/16),("x"==e?i:7&i|8).toString(16)}))}function a(){return Math.max(document.documentElement.clientHeight,document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight)}function h(t){return!(!t||1!=t.nodeType)}function l(t){return!isNaN(parseFloat(t))&&isFinite(t)}function c(t){let e=parseFloat(t);return!1!==l(t)&&("string"==typeof t&&t.indexOf(".")>-1||Math.floor(e)!==e)}function u(t){var e=["-webkit-","-webkit-","-moz-","-o-","-ms-"],i=t.toLowerCase(),n=["Webkit","webkit","Moz","O","ms"].length;if("undefined"==typeof document||void 0!==document.body.style[i])return t;for(var r=0;r<n;r++)if(void 0!==document.body.style[e[r]+i])return e[r]+i;return t}function d(t){for(var e=1,i=arguments.length;e<i;e++){var n=arguments[e];for(var r in n)void 0===t[r]&&(t[r]=n[r])}return t}function f(t){var e=[].slice.call(arguments,1);return e.forEach((function(e){e&&Object.getOwnPropertyNames(e).forEach((function(i){Object.defineProperty(t,i,Object.getOwnPropertyDescriptor(e,i))}))})),t}function p(t,e,i){var n=g(t,e,i);return e.splice(n,0,t),n}function g(t,e,i,n,r){var s,o=n||0,a=r||e.length,h=parseInt(o+(a-o)/2);return i||(i=function(t,e){return t>e?1:t<e?-1:t==e?0:void 0}),a-o<=0?h:(s=i(e[h],t),a-o==1?s>=0?h:h+1:0===s?h:-1===s?g(t,e,i,h,a):g(t,e,i,o,h))}function v(t,e,i,n,r){var s,o=n||0,a=r||e.length,h=parseInt(o+(a-o)/2);return i||(i=function(t,e){return t>e?1:t<e?-1:t==e?0:void 0}),a-o<=0?-1:(s=i(e[h],t),a-o==1?0===s?h:-1:0===s?h:-1===s?v(t,e,i,h,a):v(t,e,i,o,h))}function m(t){var e=window.getComputedStyle(t),i=0,n=0;return["width","paddingRight","paddingLeft","marginRight","marginLeft","borderRightWidth","borderLeftWidth"].forEach((function(t){i+=parseFloat(e[t])||0})),["height","paddingTop","paddingBottom","marginTop","marginBottom","borderTopWidth","borderBottomWidth"].forEach((function(t){n+=parseFloat(e[t])||0})),{height:n,width:i}}function y(t){var e=window.getComputedStyle(t),i=0,n=0;return["paddingRight","paddingLeft","marginRight","marginLeft","borderRightWidth","borderLeftWidth"].forEach((function(t){i+=parseFloat(e[t])||0})),["paddingTop","paddingBottom","marginTop","marginBottom","borderTopWidth","borderBottomWidth"].forEach((function(t){n+=parseFloat(e[t])||0})),{height:n,width:i}}function b(t){let e,i=t.ownerDocument;if(t.nodeType==Node.TEXT_NODE){let n=i.createRange();n.selectNodeContents(t),e=n.getBoundingClientRect()}else e=t.getBoundingClientRect();return e}function w(){var t=window.innerWidth,e=window.innerHeight;return{top:0,left:0,right:t,bottom:e,width:t,height:e}}function x(t,e){for(var i,n=t.parentNode.childNodes,r=-1,s=0;s<n.length&&((i=n[s]).nodeType===e&&r++,i!=t);s++);return r}function E(t){return x(t,3)}function S(t){return x(t,1)}function _(t){return["xml","opf","ncx"].indexOf(t)>-1}function O(t,e){return new Blob([t],{type:e})}function C(t,e){var i=O(t,e);return s.createObjectURL(i)}function T(t){return s.revokeObjectURL(t)}function k(t,e){if("string"==typeof t)return"data:"+e+";base64,"+btoa(encodeURIComponent(t))}function R(t){return Object.prototype.toString.call(t).slice(8,-1)}function L(t,e,i){var r;return r="undefined"==typeof DOMParser||i?n.DOMParser:DOMParser,65279===t.charCodeAt(0)&&(t=t.slice(1)),(new r).parseFromString(t,e)}function I(t,e){var i;if(!t)throw new Error("No Element Provided");return void 0!==t.querySelector?t.querySelector(e):(i=t.getElementsByTagName(e)).length?i[0]:void 0}function j(t,e){return void 0!==t.querySelector?t.querySelectorAll(e):t.getElementsByTagName(e)}function N(t,e,i){var n,r;if(void 0!==t.querySelector){for(var s in e+="[",i)e+=s+"~='"+i[s]+"'";return e+="]",t.querySelector(e)}if(n=t.getElementsByTagName(e),r=Array.prototype.slice.call(n,0).filter((function(t){for(var e in i)if(t.getAttribute(e)===i[e])return!0;return!1})))return r[0]}function A(t,e){void 0!==(t.ownerDocument||t).createTreeWalker?P(t,e,NodeFilter.SHOW_TEXT):D(t,(function(t){t&&3===t.nodeType&&e(t)}))}function P(t,e,i){var n=document.createTreeWalker(t,i,null,!1);let r;for(;r=n.nextNode();)e(r)}function D(t,e){if(e(t))return!0;if(t=t.firstChild)do{if(D(t,e))return!0;t=t.nextSibling}while(t)}function z(t){return new Promise((function(e,i){var n=new FileReader;n.readAsDataURL(t),n.onloadend=function(){e(n.result)}}))}function B(){this.resolve=null,this.reject=null,this.id=o(),this.promise=new Promise((t,e)=>{this.resolve=t,this.reject=e}),Object.freeze(this)}function q(t,e,i){var n;if(void 0!==t.querySelector&&(n=t.querySelector(`${e}[*|type="${i}"]`)),n&&0!==n.length)return n;n=j(t,e);for(var r=0;r<n.length;r++)if(n[r].getAttributeNS("http://www.idpf.org/2007/ops","type")===i||n[r].getAttribute("epub:type")===i)return n[r]}function M(t){for(var e=[],i=t.childNodes,n=0;n<i.length;n++){let t=i[n];1===t.nodeType&&e.push(t)}return e}function U(t){for(var e=[t];t;t=t.parentNode)e.unshift(t);return e}function F(t,e,i){for(var n=[],r=t.childNodes,s=0;s<r.length;s++){let t=r[s];if(1===t.nodeType&&t.nodeName.toLowerCase()===e){if(i)return t;n.push(t)}}if(!i)return n}function W(t,e){let i;if(null!==t&&""!==e)for(i=t.parentNode;1===i.nodeType;){if(i.tagName.toLowerCase()===e)return i;i=i.parentNode}}class H{constructor(){this.collapsed=!1,this.commonAncestorContainer=void 0,this.endContainer=void 0,this.endOffset=void 0,this.startContainer=void 0,this.startOffset=void 0}setStart(t,e){this.startContainer=t,this.startOffset=e,this.endContainer?this.commonAncestorContainer=this._commonAncestorContainer():this.collapse(!0),this._checkCollapsed()}setEnd(t,e){this.endContainer=t,this.endOffset=e,this.startContainer?(this.collapsed=!1,this.commonAncestorContainer=this._commonAncestorContainer()):this.collapse(!1),this._checkCollapsed()}collapse(t){this.collapsed=!0,t?(this.endContainer=this.startContainer,this.endOffset=this.startOffset,this.commonAncestorContainer=this.startContainer.parentNode):(this.startContainer=this.endContainer,this.startOffset=this.endOffset,this.commonAncestorContainer=this.endOffset.parentNode)}selectNode(t){let e=t.parentNode,i=Array.prototype.indexOf.call(e.childNodes,t);this.setStart(e,i),this.setEnd(e,i+1)}selectNodeContents(t){t.childNodes[t.childNodes-1];let e=3===t.nodeType?t.textContent.length:parent.childNodes.length;this.setStart(t,0),this.setEnd(t,e)}_commonAncestorContainer(t,e){var i=U(t||this.startContainer),n=U(e||this.endContainer);if(i[0]==n[0])for(var r=0;r<i.length;r++)if(i[r]!=n[r])return i[r-1]}_checkCollapsed(){this.startContainer===this.endContainer&&this.startOffset===this.endOffset?this.collapsed=!0:this.collapsed=!1}toString(){}}},function(t,e,i){"use strict";i.d(e,"b",(function(){return n})),i.d(e,"a",(function(){return r})),i.d(e,"c",(function(){return s}));const n="0.3",r=["keydown","keyup","keypressed","mouseup","mousedown","click","touchend","touchstart","touchmove"],s={BOOK:{OPEN_FAILED:"openFailed"},CONTENTS:{EXPAND:"expand",RESIZE:"resize",SELECTED:"selected",SELECTED_RANGE:"selectedRange",LINK_CLICKED:"linkClicked"},LOCATIONS:{CHANGED:"changed"},MANAGERS:{RESIZE:"resize",RESIZED:"resized",ORIENTATION_CHANGE:"orientationchange",ADDED:"added",SCROLL:"scroll",SCROLLED:"scrolled",REMOVED:"removed"},VIEWS:{AXIS:"axis",WRITING_MODE:"writingMode",LOAD_ERROR:"loaderror",RENDERED:"rendered",RESIZED:"resized",DISPLAYED:"displayed",SHOWN:"shown",HIDDEN:"hidden",MARK_CLICKED:"markClicked"},RENDITION:{STARTED:"started",ATTACHED:"attached",DISPLAYED:"displayed",DISPLAY_ERROR:"displayerror",RENDERED:"rendered",REMOVED:"removed",RESIZED:"resized",ORIENTATION_CHANGE:"orientationchange",LOCATION_CHANGED:"locationChanged",RELOCATED:"relocated",MARK_CLICKED:"markClicked",SELECTED:"selected",LAYOUT:"layout"},LAYOUT:{UPDATED:"updated"},ANNOTATION:{ATTACH:"attach",DETACH:"detach"}}},function(t,e,i){"use strict";var n=i(0);class r{constructor(t,e,i){var s;if(this.str="",this.base={},this.spinePos=0,this.range=!1,this.path={},this.start=null,this.end=null,!(this instanceof r))return new r(t,e,i);if("string"==typeof e?this.base=this.parseComponent(e):"object"==typeof e&&e.steps&&(this.base=e),"string"===(s=this.checkType(t)))return this.str=t,Object(n.extend)(this,this.parse(t));if("range"===s)return Object(n.extend)(this,this.fromRange(t,this.base,i));if("node"===s)return Object(n.extend)(this,this.fromNode(t,this.base,i));if("EpubCFI"===s&&t.path)return t;if(t)throw new TypeError("not a valid argument for EpubCFI");return this}checkType(t){return this.isCfiString(t)?"string":!t||"object"!=typeof t||"Range"!==Object(n.type)(t)&&void 0===t.startContainer?t&&"object"==typeof t&&void 0!==t.nodeType?"node":!!(t&&"object"==typeof t&&t instanceof r)&&"EpubCFI":"range"}parse(t){var e,i,n,r={spinePos:-1,range:!1,base:{},path:{},start:null,end:null};return"string"!=typeof t?{spinePos:-1}:(0===t.indexOf("epubcfi(")&&")"===t[t.length-1]&&(t=t.slice(8,t.length-1)),(e=this.getChapterComponent(t))?(r.base=this.parseComponent(e),i=this.getPathComponent(t),r.path=this.parseComponent(i),(n=this.getRange(t))&&(r.range=!0,r.start=this.parseComponent(n[0]),r.end=this.parseComponent(n[1])),r.spinePos=r.base.steps[1].index,r):{spinePos:-1})}parseComponent(t){var e,i={steps:[],terminal:{offset:null,assertion:null}},n=t.split(":"),r=n[0].split("/");return n.length>1&&(e=n[1],i.terminal=this.parseTerminal(e)),""===r[0]&&r.shift(),i.steps=r.map(function(t){return this.parseStep(t)}.bind(this)),i}parseStep(t){var e,i,n,r,s;if((r=t.match(/\[(.*)\]/))&&r[1]&&(s=r[1]),i=parseInt(t),!isNaN(i))return i%2==0?(e="element",n=i/2-1):(e="text",n=(i-1)/2),{type:e,index:n,id:s||null}}parseTerminal(t){var e,i,r=t.match(/\[(.*)\]/);return r&&r[1]?(e=parseInt(t.split("[")[0]),i=r[1]):e=parseInt(t),Object(n.isNumber)(e)||(e=null),{offset:e,assertion:i}}getChapterComponent(t){return t.split("!")[0]}getPathComponent(t){var e=t.split("!");if(e[1]){return e[1].split(",")[0]}}getRange(t){var e=t.split(",");return 3===e.length&&[e[1],e[2]]}getCharecterOffsetComponent(t){return t.split(":")[1]||""}joinSteps(t){return t?t.map((function(t){var e="";return"element"===t.type&&(e+=2*(t.index+1)),"text"===t.type&&(e+=1+2*t.index),t.id&&(e+="["+t.id+"]"),e})).join("/"):""}segmentString(t){var e="/";return e+=this.joinSteps(t.steps),t.terminal&&null!=t.terminal.offset&&(e+=":"+t.terminal.offset),t.terminal&&null!=t.terminal.assertion&&(e+="["+t.terminal.assertion+"]"),e}toString(){var t="epubcfi(";return t+=this.segmentString(this.base),t+="!",t+=this.segmentString(this.path),this.range&&this.start&&(t+=",",t+=this.segmentString(this.start)),this.range&&this.end&&(t+=",",t+=this.segmentString(this.end)),t+=")"}compare(t,e){var i,n,s,o;if("string"==typeof t&&(t=new r(t)),"string"==typeof e&&(e=new r(e)),t.spinePos>e.spinePos)return 1;if(t.spinePos<e.spinePos)return-1;t.range?(i=t.path.steps.concat(t.start.steps),s=t.start.terminal):(i=t.path.steps,s=t.path.terminal),e.range?(n=e.path.steps.concat(e.start.steps),o=e.start.terminal):(n=e.path.steps,o=e.path.terminal);for(var a=0;a<i.length;a++){if(!i[a])return-1;if(!n[a])return 1;if(i[a].index>n[a].index)return 1;if(i[a].index<n[a].index)return-1}return i.length<n.length?-1:s.offset>o.offset?1:s.offset<o.offset?-1:0}step(t){var e=3===t.nodeType?"text":"element";return{id:t.id,tagName:t.tagName,type:e,index:this.position(t)}}filteredStep(t,e){var i,n=this.filter(t,e);if(n)return i=3===n.nodeType?"text":"element",{id:n.id,tagName:n.tagName,type:i,index:this.filteredPosition(n,e)}}pathTo(t,e,i){for(var n,r={steps:[],terminal:{offset:null,assertion:null}},s=t;s&&s.parentNode&&9!=s.parentNode.nodeType;)(n=i?this.filteredStep(s,i):this.step(s))&&r.steps.unshift(n),s=s.parentNode;return null!=e&&e>=0&&(r.terminal.offset=e,"text"!=r.steps[r.steps.length-1].type&&r.steps.push({type:"text",index:0})),r}equalStep(t,e){return!(!t||!e)&&(t.index===e.index&&t.id===e.id&&t.type===e.type)}fromRange(t,e,i){var n={range:!1,base:{},path:{},start:null,end:null},r=t.startContainer,s=t.endContainer,o=t.startOffset,a=t.endOffset,h=!1;if(i&&(h=null!=r.ownerDocument.querySelector("."+i)),"string"==typeof e?(n.base=this.parseComponent(e),n.spinePos=n.base.steps[1].index):"object"==typeof e&&(n.base=e),t.collapsed)h&&(o=this.patchOffset(r,o,i)),n.path=this.pathTo(r,o,i);else{n.range=!0,h&&(o=this.patchOffset(r,o,i)),n.start=this.pathTo(r,o,i),h&&(a=this.patchOffset(s,a,i)),n.end=this.pathTo(s,a,i),n.path={steps:[],terminal:null};var l,c=n.start.steps.length;for(l=0;l<c&&this.equalStep(n.start.steps[l],n.end.steps[l]);l++)l===c-1?n.start.terminal===n.end.terminal&&(n.path.steps.push(n.start.steps[l]),n.range=!1):n.path.steps.push(n.start.steps[l]);n.start.steps=n.start.steps.slice(n.path.steps.length),n.end.steps=n.end.steps.slice(n.path.steps.length)}return n}fromNode(t,e,i){var n={range:!1,base:{},path:{},start:null,end:null};return"string"==typeof e?(n.base=this.parseComponent(e),n.spinePos=n.base.steps[1].index):"object"==typeof e&&(n.base=e),n.path=this.pathTo(t,null,i),n}filter(t,e){var i,n,r,s,o,a=!1;return 3===t.nodeType?(a=!0,r=t.parentNode,i=t.parentNode.classList.contains(e)):(a=!1,i=t.classList.contains(e)),i&&a?(s=r.previousSibling,o=r.nextSibling,s&&3===s.nodeType?n=s:o&&3===o.nodeType&&(n=o),n||t):!(i&&!a)&&t}patchOffset(t,e,i){if(3!=t.nodeType)throw new Error("Anchor must be a text node");var n=t,r=e;for(t.parentNode.classList.contains(i)&&(n=t.parentNode);n.previousSibling;){if(1===n.previousSibling.nodeType){if(!n.previousSibling.classList.contains(i))break;r+=n.previousSibling.textContent.length}else r+=n.previousSibling.textContent.length;n=n.previousSibling}return r}normalizedMap(t,e,i){var n,r,s,o={},a=-1,h=t.length;for(n=0;n<h;n++)1===(r=t[n].nodeType)&&t[n].classList.contains(i)&&(r=3),n>0&&3===r&&3===s?o[n]=a:e===r&&(a+=1,o[n]=a),s=r;return o}position(t){var e,i;return 1===t.nodeType?((e=t.parentNode.children)||(e=Object(n.findChildren)(t.parentNode)),i=Array.prototype.indexOf.call(e,t)):i=(e=this.textNodes(t.parentNode)).indexOf(t),i}filteredPosition(t,e){var i,n;return 1===t.nodeType?(i=t.parentNode.children,n=this.normalizedMap(i,1,e)):(i=t.parentNode.childNodes,t.parentNode.classList.contains(e)&&(i=(t=t.parentNode).parentNode.childNodes),n=this.normalizedMap(i,3,e)),n[Array.prototype.indexOf.call(i,t)]}stepsToXpath(t){var e=[".","*"];return t.forEach((function(t){var i=t.index+1;t.id?e.push("*[position()="+i+" and @id='"+t.id+"']"):"text"===t.type?e.push("text()["+i+"]"):e.push("*["+i+"]")})),e.join("/")}stepsToQuerySelector(t){var e=["html"];return t.forEach((function(t){var i=t.index+1;t.id?e.push("#"+t.id):"text"===t.type||e.push("*:nth-child("+i+")")})),e.join(">")}textNodes(t,e){return Array.prototype.slice.call(t.childNodes).filter((function(t){return 3===t.nodeType||!(!e||!t.classList.contains(e))}))}walkToNode(t,e,i){var r,s,o=e||document,a=o.documentElement,h=t.length;for(s=0;s<h&&("element"===(r=t[s]).type?a=r.id?o.getElementById(r.id):(a.children||Object(n.findChildren)(a))[r.index]:"text"===r.type&&(a=this.textNodes(a,i)[r.index]),a);s++);return a}findNode(t,e,i){var n,r,s=e||document;return i||void 0===s.evaluate?n=i?this.walkToNode(t,s,i):this.walkToNode(t,s):(r=this.stepsToXpath(t),n=s.evaluate(r,s,null,XPathResult.FIRST_ORDERED_NODE_TYPE,null).singleNodeValue),n}fixMiss(t,e,i,n){var r,s,o=this.findNode(t.slice(0,-1),i,n),a=o.childNodes,h=this.normalizedMap(a,3,n),l=t[t.length-1].index;for(let t in h){if(!h.hasOwnProperty(t))return;if(h[t]===l){if(!(e>(s=(r=a[t]).textContent.length))){o=1===r.nodeType?r.childNodes[0]:r;break}e-=s}}return{container:o,offset:e}}toRange(t,e){var i,r,s,o,a,h,l,c,u=t||document,d=!!e&&null!=u.querySelector("."+e);if(i=void 0!==u.createRange?u.createRange():new n.RangeObject,this.range?(r=this.start,h=this.path.steps.concat(r.steps),o=this.findNode(h,u,d?e:null),s=this.end,l=this.path.steps.concat(s.steps),a=this.findNode(l,u,d?e:null)):(r=this.path,h=this.path.steps,o=this.findNode(this.path.steps,u,d?e:null)),!o)return console.log("No startContainer found for",this.toString()),null;try{null!=r.terminal.offset?i.setStart(o,r.terminal.offset):i.setStart(o,0)}catch(t){c=this.fixMiss(h,r.terminal.offset,u,d?e:null),i.setStart(c.container,c.offset)}if(a)try{null!=s.terminal.offset?i.setEnd(a,s.terminal.offset):i.setEnd(a,0)}catch(t){c=this.fixMiss(l,this.end.terminal.offset,u,d?e:null),i.setEnd(c.container,c.offset)}return i}isCfiString(t){return"string"==typeof t&&0===t.indexOf("epubcfi(")&&")"===t[t.length-1]}generateChapterComponent(t,e,i){var n="/"+2*(t+1)+"/";return n+=2*(parseInt(e)+1),i&&(n+="["+i+"]"),n}collapse(t){this.range&&(this.range=!1,t?(this.path.steps=this.path.steps.concat(this.start.steps),this.path.terminal=this.start.terminal):(this.path.steps=this.path.steps.concat(this.end.steps),this.path.terminal=this.end.terminal))}}e.a=r},function(t,e,i){"use strict";var n,r,s,o,a,h,l,c=i(108),u=i(122),d=Function.prototype.apply,f=Function.prototype.call,p=Object.create,g=Object.defineProperty,v=Object.defineProperties,m=Object.prototype.hasOwnProperty,y={configurable:!0,enumerable:!1,writable:!0};r=function(t,e){var i,r;return u(e),r=this,n.call(this,t,i=function(){s.call(r,t,i),d.call(e,this,arguments)}),i.__eeOnceListener__=e,this},a={on:n=function(t,e){var i;return u(e),m.call(this,"__ee__")?i=this.__ee__:(i=y.value=p(null),g(this,"__ee__",y),y.value=null),i[t]?"object"==typeof i[t]?i[t].push(e):i[t]=[i[t],e]:i[t]=e,this},once:r,off:s=function(t,e){var i,n,r,s;if(u(e),!m.call(this,"__ee__"))return this;if(!(i=this.__ee__)[t])return this;if("object"==typeof(n=i[t]))for(s=0;r=n[s];++s)r!==e&&r.__eeOnceListener__!==e||(2===n.length?i[t]=n[s?0:1]:n.splice(s,1));else n!==e&&n.__eeOnceListener__!==e||delete i[t];return this},emit:o=function(t){var e,i,n,r,s;if(m.call(this,"__ee__")&&(r=this.__ee__[t]))if("object"==typeof r){for(i=arguments.length,s=new Array(i-1),e=1;e<i;++e)s[e-1]=arguments[e];for(r=r.slice(),e=0;n=r[e];++e)d.call(n,this,s)}else switch(arguments.length){case 1:f.call(r,this);break;case 2:f.call(r,this,arguments[1]);break;case 3:f.call(r,this,arguments[1],arguments[2]);break;default:for(i=arguments.length,s=new Array(i-1),e=1;e<i;++e)s[e-1]=arguments[e];d.call(r,this,s)}}},h={on:c(n),once:c(r),off:c(s),emit:c(o)},l=v({},h),t.exports=e=function(t){return null==t?p(l):v(Object(t),h)},e.methods=a},function(t,e,i){"use strict";i(14),i(20);var n=i(9),r=i.n(n);e.a=class{constructor(t){var e;t.indexOf("://")>-1&&(t=new URL(t).pathname),e=this.parse(t),this.path=t,this.isDirectory(t)?this.directory=t:this.directory=e.dir+"/",this.filename=e.base,this.extension=e.ext.slice(1)}parse(t){return r.a.parse(t)}isAbsolute(t){return r.a.isAbsolute(t||this.path)}isDirectory(t){return"/"===t.charAt(t.length-1)}resolve(t){return r.a.resolve(this.directory,t)}relative(t){return t&&t.indexOf("://")>-1?t:r.a.relative(this.directory,t)}splitPath(t){return this.splitPathRe.exec(t).slice(1)}toString(){return this.path}}},function(t,e,i){"use strict";i(14),i(20);var n=i(4),r=i(9),s=i.n(r);e.a=class{constructor(t,e){var i=t.indexOf("://")>-1,r=t;if(this.Url=void 0,this.href=t,this.protocol="",this.origin="",this.hash="",this.hash="",this.search="",this.base=e,!i&&!1!==e&&"string"!=typeof e&&window&&window.location&&(this.base=window.location.href),i||this.base)try{this.base?this.Url=new URL(t,this.base):this.Url=new URL(t),this.href=this.Url.href,this.protocol=this.Url.protocol,this.origin=this.Url.origin,this.hash=this.Url.hash,this.search=this.Url.search,r=this.Url.pathname+(this.Url.search?this.Url.search:"")}catch(t){this.Url=void 0,this.base&&(r=new n.a(this.base).resolve(r))}this.Path=new n.a(r),this.directory=this.Path.directory,this.filename=this.Path.filename,this.extension=this.Path.extension}path(){return this.Path}resolve(t){var e;return t.indexOf("://")>-1?t:(e=s.a.resolve(this.directory,t),this.origin+e)}relative(t){return s.a.relative(t,this.directory)}toString(){return this.href}}},function(t,e,i){"use strict";i(14);e.a=class{constructor(t){this.context=t||this,this.hooks=[]}register(){for(var t=0;t<arguments.length;++t)if("function"==typeof arguments[t])this.hooks.push(arguments[t]);else for(var e=0;e<arguments[t].length;++e)this.hooks.push(arguments[t][e])}deregister(t){let e;for(let i=0;i<this.hooks.length;i++)if(e=this.hooks[i],e===t){this.hooks.splice(i,1);break}}trigger(){var t=arguments,e=this.context,i=[];return this.hooks.forEach((function(n){var r=n.apply(e,t);r&&"function"==typeof r.then&&i.push(r)})),Promise.all(i)}list(){return this.hooks}clear(){return this.hooks=[]}}},function(t,e,i){(function(e){var i=function(t){return t&&t.Math==Math&&t};t.exports=i("object"==typeof globalThis&&globalThis)||i("object"==typeof window&&window)||i("object"==typeof self&&self)||i("object"==typeof e&&e)||Function("return this")()}).call(this,i(30))},function(t,e,i){var n=i(7),r=i(66),s=i(10),o=i(67),a=i(70),h=i(99),l=r("wks"),c=n.Symbol,u=h?c:c&&c.withoutSetter||o;t.exports=function(t){return s(l,t)||(a&&s(c,t)?l[t]=c[t]:l[t]=u("Symbol."+t)),l[t]}},function(t,e,i){"use strict";if(!n)var n={cwd:function(){return"/"}};function r(t){if("string"!=typeof t)throw new TypeError("Path must be a string. Received "+t)}function s(t,e){for(var i,n="",r=-1,s=0,o=0;o<=t.length;++o){if(o<t.length)i=t.charCodeAt(o);else{if(47===i)break;i=47}if(47===i){if(r===o-1||1===s);else if(r!==o-1&&2===s){if(n.length<2||46!==n.charCodeAt(n.length-1)||46!==n.charCodeAt(n.length-2))if(n.length>2){for(var a=n.length-1,h=a;h>=0&&47!==n.charCodeAt(h);--h);if(h!==a){n=-1===h?"":n.slice(0,h),r=o,s=0;continue}}else if(2===n.length||1===n.length){n="",r=o,s=0;continue}e&&(n.length>0?n+="/..":n="..")}else n.length>0?n+="/"+t.slice(r+1,o):n=t.slice(r+1,o);r=o,s=0}else 46===i&&-1!==s?++s:s=-1}return n}var o={resolve:function(){for(var t,e="",i=!1,o=arguments.length-1;o>=-1&&!i;o--){var a;o>=0?a=arguments[o]:(void 0===t&&(t=n.cwd()),a=t),r(a),0!==a.length&&(e=a+"/"+e,i=47===a.charCodeAt(0))}return e=s(e,!i),i?e.length>0?"/"+e:"/":e.length>0?e:"."},normalize:function(t){if(r(t),0===t.length)return".";var e=47===t.charCodeAt(0),i=47===t.charCodeAt(t.length-1);return 0!==(t=s(t,!e)).length||e||(t="."),t.length>0&&i&&(t+="/"),e?"/"+t:t},isAbsolute:function(t){return r(t),t.length>0&&47===t.charCodeAt(0)},join:function(){if(0===arguments.length)return".";for(var t,e=0;e<arguments.length;++e){var i=arguments[e];r(i),i.length>0&&(void 0===t?t=i:t+="/"+i)}return void 0===t?".":o.normalize(t)},relative:function(t,e){if(r(t),r(e),t===e)return"";if((t=o.resolve(t))===(e=o.resolve(e)))return"";for(var i=1;i<t.length&&47===t.charCodeAt(i);++i);for(var n=t.length,s=n-i,a=1;a<e.length&&47===e.charCodeAt(a);++a);for(var h=e.length-a,l=s<h?s:h,c=-1,u=0;u<=l;++u){if(u===l){if(h>l){if(47===e.charCodeAt(a+u))return e.slice(a+u+1);if(0===u)return e.slice(a+u)}else s>l&&(47===t.charCodeAt(i+u)?c=u:0===u&&(c=0));break}var d=t.charCodeAt(i+u);if(d!==e.charCodeAt(a+u))break;47===d&&(c=u)}var f="";for(u=i+c+1;u<=n;++u)u!==n&&47!==t.charCodeAt(u)||(0===f.length?f+="..":f+="/..");return f.length>0?f+e.slice(a+c):(a+=c,47===e.charCodeAt(a)&&++a,e.slice(a))},_makeLong:function(t){return t},dirname:function(t){if(r(t),0===t.length)return".";for(var e=t.charCodeAt(0),i=47===e,n=-1,s=!0,o=t.length-1;o>=1;--o)if(47===(e=t.charCodeAt(o))){if(!s){n=o;break}}else s=!1;return-1===n?i?"/":".":i&&1===n?"//":t.slice(0,n)},basename:function(t,e){if(void 0!==e&&"string"!=typeof e)throw new TypeError('"ext" argument must be a string');r(t);var i,n=0,s=-1,o=!0;if(void 0!==e&&e.length>0&&e.length<=t.length){if(e.length===t.length&&e===t)return"";var a=e.length-1,h=-1;for(i=t.length-1;i>=0;--i){var l=t.charCodeAt(i);if(47===l){if(!o){n=i+1;break}}else-1===h&&(o=!1,h=i+1),a>=0&&(l===e.charCodeAt(a)?-1==--a&&(s=i):(a=-1,s=h))}return n===s?s=h:-1===s&&(s=t.length),t.slice(n,s)}for(i=t.length-1;i>=0;--i)if(47===t.charCodeAt(i)){if(!o){n=i+1;break}}else-1===s&&(o=!1,s=i+1);return-1===s?"":t.slice(n,s)},extname:function(t){r(t);for(var e=-1,i=0,n=-1,s=!0,o=0,a=t.length-1;a>=0;--a){var h=t.charCodeAt(a);if(47!==h)-1===n&&(s=!1,n=a+1),46===h?-1===e?e=a:1!==o&&(o=1):-1!==e&&(o=-1);else if(!s){i=a+1;break}}return-1===e||-1===n||0===o||1===o&&e===n-1&&e===i+1?"":t.slice(e,n)},format:function(t){if(null===t||"object"!=typeof t)throw new TypeError('Parameter "pathObject" must be an object, not '+typeof t);return function(t,e){var i=e.dir||e.root,n=e.base||(e.name||"")+(e.ext||"");return i?i===e.root?i+n:i+t+n:n}("/",t)},parse:function(t){r(t);var e={root:"",dir:"",base:"",ext:"",name:""};if(0===t.length)return e;var i,n=t.charCodeAt(0),s=47===n;s?(e.root="/",i=1):i=0;for(var o=-1,a=0,h=-1,l=!0,c=t.length-1,u=0;c>=i;--c)if(47!==(n=t.charCodeAt(c)))-1===h&&(l=!1,h=c+1),46===n?-1===o?o=c:1!==u&&(u=1):-1!==o&&(u=-1);else if(!l){a=c+1;break}return-1===o||-1===h||0===u||1===u&&o===h-1&&o===a+1?-1!==h&&(e.base=e.name=0===a&&s?t.slice(1,h):t.slice(a,h)):(0===a&&s?(e.name=t.slice(1,o),e.base=t.slice(1,h)):(e.name=t.slice(a,o),e.base=t.slice(a,h)),e.ext=t.slice(o,h)),a>0?e.dir=t.slice(0,a-1):s&&(e.dir="/"),e},sep:"/",delimiter:":",posix:null};t.exports=o},function(t,e){var i={}.hasOwnProperty;t.exports=function(t,e){return i.call(t,e)}},function(t,e,i){"use strict";i.d(e,"a",(function(){return s})),i.d(e,"b",(function(){return o})),i.d(e,"d",(function(){return a})),i.d(e,"c",(function(){return h})),i.d(e,"e",(function(){return l}));i(24);var n=i(0),r=i(5);i(4);function s(t,e){var i,r,s=e.url,o=s.indexOf("://")>-1;t&&(r=Object(n.qs)(t,"head"),(i=Object(n.qs)(r,"base"))||(i=t.createElement("base"),r.insertBefore(i,r.firstChild)),!o&&window&&window.location&&(s=window.location.origin+s),i.setAttribute("href",s))}function o(t,e){var i,r,s=e.canonical;t&&(i=Object(n.qs)(t,"head"),(r=Object(n.qs)(i,"link[rel='canonical']"))?r.setAttribute("href",s):((r=t.createElement("link")).setAttribute("rel","canonical"),r.setAttribute("href",s),i.appendChild(r)))}function a(t,e){var i,r,s=e.idref;t&&(i=Object(n.qs)(t,"head"),(r=Object(n.qs)(i,"link[property='dc.identifier']"))?r.setAttribute("content",s):((r=t.createElement("meta")).setAttribute("name","dc.identifier"),r.setAttribute("content",s),i.appendChild(r)))}function h(t,e){var i=t.querySelectorAll("a[href]");if(i.length)for(var s=Object(n.qs)(t.ownerDocument,"base"),o=s?s.getAttribute("href"):void 0,a=function(t){var i=t.getAttribute("href");if(0!==i.indexOf("mailto:"))if(i.indexOf("://")>-1)t.setAttribute("target","_blank");else{var n;try{n=new r.a(i,o)}catch(t){}t.onclick=function(){return n&&n.hash?e(n.Path.path+n.hash):e(n?n.Path.path:i),!1}}}.bind(this),h=0;h<i.length;h++)a(i[h])}function l(t,e,i){return e.forEach((function(e,n){e&&i[n]&&(e=e.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),t=t.replace(new RegExp(e,"g"),i[n]))})),t}},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e,i){var n=i(17);t.exports=function(t){if(!n(t))throw TypeError(String(t)+" is not an object");return t}},function(t,e,i){var n=i(7),r=i(102),s=i(71),o=i(15),a=i(8),h=a("iterator"),l=a("toStringTag"),c=s.values;for(var u in r){var d=n[u],f=d&&d.prototype;if(f){if(f[h]!==c)try{o(f,h,c)}catch(t){f[h]=c}if(f[l]||o(f,l,u),r[u])for(var p in s)if(f[p]!==s[p])try{o(f,p,s[p])}catch(t){f[p]=s[p]}}}},function(t,e,i){var n=i(16),r=i(18),s=i(25);t.exports=n?function(t,e,i){return r.f(t,e,s(1,i))}:function(t,e,i){return t[e]=i,t}},function(t,e,i){var n=i(12);t.exports=!n((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,i){var n=i(16),r=i(62),s=i(13),o=i(41),a=Object.defineProperty;e.f=n?a:function(t,e,i){if(s(t),e=o(e,!0),s(i),r)try{return a(t,e,i)}catch(t){}if("get"in i||"set"in i)throw TypeError("Accessors not supported");return"value"in i&&(t[e]=i.value),t}},function(t,e,i){var n=i(7),r=i(15),s=i(10),o=i(42),a=i(64),h=i(26),l=h.get,c=h.enforce,u=String(String).split("String");(t.exports=function(t,e,i,a){var h=!!a&&!!a.unsafe,l=!!a&&!!a.enumerable,d=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||s(i,"name")||r(i,"name",e),c(i).source=u.join("string"==typeof e?e:"")),t!==n?(h?!d&&t[e]&&(l=!0):delete t[e],l?t[e]=i:r(t,e,i)):l?t[e]=i:o(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&l(this).source||a(this)}))},function(t,e,i){"use strict";i(123);var n,r=i(31),s=i(16),o=i(78),a=i(7),h=i(72),l=i(19),c=i(79),u=i(10),d=i(124),f=i(125),p=i(49).codeAt,g=i(131),v=i(37),m=i(132),y=i(26),b=a.URL,w=m.URLSearchParams,x=m.getState,E=y.set,S=y.getterFor("URL"),_=Math.floor,O=Math.pow,C=/[A-Za-z]/,T=/[\d+-.A-Za-z]/,k=/\d/,R=/^(0x|0X)/,L=/^[0-7]+$/,I=/^\d+$/,j=/^[\dA-Fa-f]+$/,N=/[\u0000\u0009\u000A\u000D #%/:?@[\\]]/,A=/[\u0000\u0009\u000A\u000D #/:?@[\\]]/,P=/^[\u0000-\u001F ]+|[\u0000-\u001F ]+$/g,D=/[\u0009\u000A\u000D]/g,z=function(t,e){var i,n,r;if("["==e.charAt(0)){if("]"!=e.charAt(e.length-1))return"Invalid host";if(!(i=q(e.slice(1,-1))))return"Invalid host";t.host=i}else if(G(t)){if(e=g(e),N.test(e))return"Invalid host";if(null===(i=B(e)))return"Invalid host";t.host=i}else{if(A.test(e))return"Invalid host";for(i="",n=f(e),r=0;r<n.length;r++)i+=V(n[r],U);t.host=i}},B=function(t){var e,i,n,r,s,o,a,h=t.split(".");if(h.length&&""==h[h.length-1]&&h.pop(),(e=h.length)>4)return t;for(i=[],n=0;n<e;n++){if(""==(r=h[n]))return t;if(s=10,r.length>1&&"0"==r.charAt(0)&&(s=R.test(r)?16:8,r=r.slice(8==s?1:2)),""===r)o=0;else{if(!(10==s?I:8==s?L:j).test(r))return t;o=parseInt(r,s)}i.push(o)}for(n=0;n<e;n++)if(o=i[n],n==e-1){if(o>=O(256,5-e))return null}else if(o>255)return null;for(a=i.pop(),n=0;n<i.length;n++)a+=i[n]*O(256,3-n);return a},q=function(t){var e,i,n,r,s,o,a,h=[0,0,0,0,0,0,0,0],l=0,c=null,u=0,d=function(){return t.charAt(u)};if(":"==d()){if(":"!=t.charAt(1))return;u+=2,c=++l}for(;d();){if(8==l)return;if(":"!=d()){for(e=i=0;i<4&&j.test(d());)e=16*e+parseInt(d(),16),u++,i++;if("."==d()){if(0==i)return;if(u-=i,l>6)return;for(n=0;d();){if(r=null,n>0){if(!("."==d()&&n<4))return;u++}if(!k.test(d()))return;for(;k.test(d());){if(s=parseInt(d(),10),null===r)r=s;else{if(0==r)return;r=10*r+s}if(r>255)return;u++}h[l]=256*h[l]+r,2!=++n&&4!=n||l++}if(4!=n)return;break}if(":"==d()){if(u++,!d())return}else if(d())return;h[l++]=e}else{if(null!==c)return;u++,c=++l}}if(null!==c)for(o=l-c,l=7;0!=l&&o>0;)a=h[l],h[l--]=h[c+o-1],h[c+--o]=a;else if(8!=l)return;return h},M=function(t){var e,i,n,r;if("number"==typeof t){for(e=[],i=0;i<4;i++)e.unshift(t%256),t=_(t/256);return e.join(".")}if("object"==typeof t){for(e="",n=function(t){for(var e=null,i=1,n=null,r=0,s=0;s<8;s++)0!==t[s]?(r>i&&(e=n,i=r),n=null,r=0):(null===n&&(n=s),++r);return r>i&&(e=n,i=r),e}(t),i=0;i<8;i++)r&&0===t[i]||(r&&(r=!1),n===i?(e+=i?":":"::",r=!0):(e+=t[i].toString(16),i<7&&(e+=":")));return"["+e+"]"}return t},U={},F=d({},U,{" ":1,'"':1,"<":1,">":1,"`":1}),W=d({},F,{"#":1,"?":1,"{":1,"}":1}),H=d({},W,{"/":1,":":1,";":1,"=":1,"@":1,"[":1,"\\":1,"]":1,"^":1,"|":1}),V=function(t,e){var i=p(t,0);return i>32&&i<127&&!u(e,t)?t:encodeURIComponent(t)},X={ftp:21,file:null,http:80,https:443,ws:80,wss:443},G=function(t){return u(X,t.scheme)},Y=function(t){return""!=t.username||""!=t.password},$=function(t){return!t.host||t.cannotBeABaseURL||"file"==t.scheme},K=function(t,e){var i;return 2==t.length&&C.test(t.charAt(0))&&(":"==(i=t.charAt(1))||!e&&"|"==i)},Z=function(t){var e;return t.length>1&&K(t.slice(0,2))&&(2==t.length||"/"===(e=t.charAt(2))||"\\"===e||"?"===e||"#"===e)},J=function(t){var e=t.path,i=e.length;!i||"file"==t.scheme&&1==i&&K(e[0],!0)||e.pop()},Q=function(t){return"."===t||"%2e"===t.toLowerCase()},tt={},et={},it={},nt={},rt={},st={},ot={},at={},ht={},lt={},ct={},ut={},dt={},ft={},pt={},gt={},vt={},mt={},yt={},bt={},wt={},xt=function(t,e,i,r){var s,o,a,h,l,c=i||tt,d=0,p="",g=!1,v=!1,m=!1;for(i||(t.scheme="",t.username="",t.password="",t.host=null,t.port=null,t.path=[],t.query=null,t.fragment=null,t.cannotBeABaseURL=!1,e=e.replace(P,"")),e=e.replace(D,""),s=f(e);d<=s.length;){switch(o=s[d],c){case tt:if(!o||!C.test(o)){if(i)return"Invalid scheme";c=it;continue}p+=o.toLowerCase(),c=et;break;case et:if(o&&(T.test(o)||"+"==o||"-"==o||"."==o))p+=o.toLowerCase();else{if(":"!=o){if(i)return"Invalid scheme";p="",c=it,d=0;continue}if(i&&(G(t)!=u(X,p)||"file"==p&&(Y(t)||null!==t.port)||"file"==t.scheme&&!t.host))return;if(t.scheme=p,i)return void(G(t)&&X[t.scheme]==t.port&&(t.port=null));p="","file"==t.scheme?c=ft:G(t)&&r&&r.scheme==t.scheme?c=nt:G(t)?c=at:"/"==s[d+1]?(c=rt,d++):(t.cannotBeABaseURL=!0,t.path.push(""),c=yt)}break;case it:if(!r||r.cannotBeABaseURL&&"#"!=o)return"Invalid scheme";if(r.cannotBeABaseURL&&"#"==o){t.scheme=r.scheme,t.path=r.path.slice(),t.query=r.query,t.fragment="",t.cannotBeABaseURL=!0,c=wt;break}c="file"==r.scheme?ft:st;continue;case nt:if("/"!=o||"/"!=s[d+1]){c=st;continue}c=ht,d++;break;case rt:if("/"==o){c=lt;break}c=mt;continue;case st:if(t.scheme=r.scheme,o==n)t.username=r.username,t.password=r.password,t.host=r.host,t.port=r.port,t.path=r.path.slice(),t.query=r.query;else if("/"==o||"\\"==o&&G(t))c=ot;else if("?"==o)t.username=r.username,t.password=r.password,t.host=r.host,t.port=r.port,t.path=r.path.slice(),t.query="",c=bt;else{if("#"!=o){t.username=r.username,t.password=r.password,t.host=r.host,t.port=r.port,t.path=r.path.slice(),t.path.pop(),c=mt;continue}t.username=r.username,t.password=r.password,t.host=r.host,t.port=r.port,t.path=r.path.slice(),t.query=r.query,t.fragment="",c=wt}break;case ot:if(!G(t)||"/"!=o&&"\\"!=o){if("/"!=o){t.username=r.username,t.password=r.password,t.host=r.host,t.port=r.port,c=mt;continue}c=lt}else c=ht;break;case at:if(c=ht,"/"!=o||"/"!=p.charAt(d+1))continue;d++;break;case ht:if("/"!=o&&"\\"!=o){c=lt;continue}break;case lt:if("@"==o){g&&(p="%40"+p),g=!0,a=f(p);for(var y=0;y<a.length;y++){var b=a[y];if(":"!=b||m){var w=V(b,H);m?t.password+=w:t.username+=w}else m=!0}p=""}else if(o==n||"/"==o||"?"==o||"#"==o||"\\"==o&&G(t)){if(g&&""==p)return"Invalid authority";d-=f(p).length+1,p="",c=ct}else p+=o;break;case ct:case ut:if(i&&"file"==t.scheme){c=gt;continue}if(":"!=o||v){if(o==n||"/"==o||"?"==o||"#"==o||"\\"==o&&G(t)){if(G(t)&&""==p)return"Invalid host";if(i&&""==p&&(Y(t)||null!==t.port))return;if(h=z(t,p))return h;if(p="",c=vt,i)return;continue}"["==o?v=!0:"]"==o&&(v=!1),p+=o}else{if(""==p)return"Invalid host";if(h=z(t,p))return h;if(p="",c=dt,i==ut)return}break;case dt:if(!k.test(o)){if(o==n||"/"==o||"?"==o||"#"==o||"\\"==o&&G(t)||i){if(""!=p){var x=parseInt(p,10);if(x>65535)return"Invalid port";t.port=G(t)&&x===X[t.scheme]?null:x,p=""}if(i)return;c=vt;continue}return"Invalid port"}p+=o;break;case ft:if(t.scheme="file","/"==o||"\\"==o)c=pt;else{if(!r||"file"!=r.scheme){c=mt;continue}if(o==n)t.host=r.host,t.path=r.path.slice(),t.query=r.query;else if("?"==o)t.host=r.host,t.path=r.path.slice(),t.query="",c=bt;else{if("#"!=o){Z(s.slice(d).join(""))||(t.host=r.host,t.path=r.path.slice(),J(t)),c=mt;continue}t.host=r.host,t.path=r.path.slice(),t.query=r.query,t.fragment="",c=wt}}break;case pt:if("/"==o||"\\"==o){c=gt;break}r&&"file"==r.scheme&&!Z(s.slice(d).join(""))&&(K(r.path[0],!0)?t.path.push(r.path[0]):t.host=r.host),c=mt;continue;case gt:if(o==n||"/"==o||"\\"==o||"?"==o||"#"==o){if(!i&&K(p))c=mt;else if(""==p){if(t.host="",i)return;c=vt}else{if(h=z(t,p))return h;if("localhost"==t.host&&(t.host=""),i)return;p="",c=vt}continue}p+=o;break;case vt:if(G(t)){if(c=mt,"/"!=o&&"\\"!=o)continue}else if(i||"?"!=o)if(i||"#"!=o){if(o!=n&&(c=mt,"/"!=o))continue}else t.fragment="",c=wt;else t.query="",c=bt;break;case mt:if(o==n||"/"==o||"\\"==o&&G(t)||!i&&("?"==o||"#"==o)){if(".."===(l=(l=p).toLowerCase())||"%2e."===l||".%2e"===l||"%2e%2e"===l?(J(t),"/"==o||"\\"==o&&G(t)||t.path.push("")):Q(p)?"/"==o||"\\"==o&&G(t)||t.path.push(""):("file"==t.scheme&&!t.path.length&&K(p)&&(t.host&&(t.host=""),p=p.charAt(0)+":"),t.path.push(p)),p="","file"==t.scheme&&(o==n||"?"==o||"#"==o))for(;t.path.length>1&&""===t.path[0];)t.path.shift();"?"==o?(t.query="",c=bt):"#"==o&&(t.fragment="",c=wt)}else p+=V(o,W);break;case yt:"?"==o?(t.query="",c=bt):"#"==o?(t.fragment="",c=wt):o!=n&&(t.path[0]+=V(o,U));break;case bt:i||"#"!=o?o!=n&&("'"==o&&G(t)?t.query+="%27":t.query+="#"==o?"%23":V(o,U)):(t.fragment="",c=wt);break;case wt:o!=n&&(t.fragment+=V(o,F))}d++}},Et=function(t){var e,i,n=c(this,Et,"URL"),r=arguments.length>1?arguments[1]:void 0,o=String(t),a=E(n,{type:"URL"});if(void 0!==r)if(r instanceof Et)e=S(r);else if(i=xt(e={},String(r)))throw TypeError(i);if(i=xt(a,o,null,e))throw TypeError(i);var h=a.searchParams=new w,l=x(h);l.updateSearchParams(a.query),l.updateURL=function(){a.query=String(h)||null},s||(n.href=_t.call(n),n.origin=Ot.call(n),n.protocol=Ct.call(n),n.username=Tt.call(n),n.password=kt.call(n),n.host=Rt.call(n),n.hostname=Lt.call(n),n.port=It.call(n),n.pathname=jt.call(n),n.search=Nt.call(n),n.searchParams=At.call(n),n.hash=Pt.call(n))},St=Et.prototype,_t=function(){var t=S(this),e=t.scheme,i=t.username,n=t.password,r=t.host,s=t.port,o=t.path,a=t.query,h=t.fragment,l=e+":";return null!==r?(l+="//",Y(t)&&(l+=i+(n?":"+n:"")+"@"),l+=M(r),null!==s&&(l+=":"+s)):"file"==e&&(l+="//"),l+=t.cannotBeABaseURL?o[0]:o.length?"/"+o.join("/"):"",null!==a&&(l+="?"+a),null!==h&&(l+="#"+h),l},Ot=function(){var t=S(this),e=t.scheme,i=t.port;if("blob"==e)try{return new URL(e.path[0]).origin}catch(t){return"null"}return"file"!=e&&G(t)?e+"://"+M(t.host)+(null!==i?":"+i:""):"null"},Ct=function(){return S(this).scheme+":"},Tt=function(){return S(this).username},kt=function(){return S(this).password},Rt=function(){var t=S(this),e=t.host,i=t.port;return null===e?"":null===i?M(e):M(e)+":"+i},Lt=function(){var t=S(this).host;return null===t?"":M(t)},It=function(){var t=S(this).port;return null===t?"":String(t)},jt=function(){var t=S(this),e=t.path;return t.cannotBeABaseURL?e[0]:e.length?"/"+e.join("/"):""},Nt=function(){var t=S(this).query;return t?"?"+t:""},At=function(){return S(this).searchParams},Pt=function(){var t=S(this).fragment;return t?"#"+t:""},Dt=function(t,e){return{get:t,set:e,configurable:!0,enumerable:!0}};if(s&&h(St,{href:Dt(_t,(function(t){var e=S(this),i=String(t),n=xt(e,i);if(n)throw TypeError(n);x(e.searchParams).updateSearchParams(e.query)})),origin:Dt(Ot),protocol:Dt(Ct,(function(t){var e=S(this);xt(e,String(t)+":",tt)})),username:Dt(Tt,(function(t){var e=S(this),i=f(String(t));if(!$(e)){e.username="";for(var n=0;n<i.length;n++)e.username+=V(i[n],H)}})),password:Dt(kt,(function(t){var e=S(this),i=f(String(t));if(!$(e)){e.password="";for(var n=0;n<i.length;n++)e.password+=V(i[n],H)}})),host:Dt(Rt,(function(t){var e=S(this);e.cannotBeABaseURL||xt(e,String(t),ct)})),hostname:Dt(Lt,(function(t){var e=S(this);e.cannotBeABaseURL||xt(e,String(t),ut)})),port:Dt(It,(function(t){var e=S(this);$(e)||(""==(t=String(t))?e.port=null:xt(e,t,dt))})),pathname:Dt(jt,(function(t){var e=S(this);e.cannotBeABaseURL||(e.path=[],xt(e,t+"",vt))})),search:Dt(Nt,(function(t){var e=S(this);""==(t=String(t))?e.query=null:("?"==t.charAt(0)&&(t=t.slice(1)),e.query="",xt(e,t,bt)),x(e.searchParams).updateSearchParams(e.query)})),searchParams:Dt(At),hash:Dt(Pt,(function(t){var e=S(this);""!=(t=String(t))?("#"==t.charAt(0)&&(t=t.slice(1)),e.fragment="",xt(e,t,wt)):e.fragment=null}))}),l(St,"toJSON",(function(){return _t.call(this)}),{enumerable:!0}),l(St,"toString",(function(){return _t.call(this)}),{enumerable:!0}),b){var zt=b.createObjectURL,Bt=b.revokeObjectURL;zt&&l(Et,"createObjectURL",(function(t){return zt.apply(b,arguments)})),Bt&&l(Et,"revokeObjectURL",(function(t){return Bt.apply(b,arguments)}))}v(Et,"URL"),r({global:!0,forced:!o,sham:!s},{URL:Et})},function(t,e,i){"use strict";var n=i(0);e.a=class{constructor(t){this._q=[],this.context=t,this.tick=n.requestAnimationFrame,this.running=!1,this.paused=!1}enqueue(){var t,e,i=[].shift.call(arguments),r=arguments;if(!i)throw new Error("No Task Provided");return e="function"==typeof i?{task:i,args:r,deferred:t=new n.defer,promise:t.promise}:{promise:i},this._q.push(e),0!=this.paused||this.running||this.run(),e.promise}dequeue(){var t,e,i;return!this._q.length||this.paused?((t=new n.defer).deferred.resolve(),t.promise):(e=(t=this._q.shift()).task)?(i=e.apply(this.context,t.args))&&"function"==typeof i.then?i.then(function(){t.deferred.resolve.apply(this.context,arguments)}.bind(this),function(){t.deferred.reject.apply(this.context,arguments)}.bind(this)):(t.deferred.resolve.apply(this.context,i),t.promise):t.promise?t.promise:void 0}dump(){for(;this._q.length;)this.dequeue()}run(){return this.running||(this.running=!0,this.defered=new n.defer),this.tick.call(window,()=>{this._q.length?this.dequeue().then(function(){this.run()}.bind(this)):(this.defered.resolve(),this.running=void 0)}),1==this.paused&&(this.paused=!1),this.defered.promise}flush(){return this.running?this.running:this._q.length?(this.running=this.dequeue().then(function(){return this.running=void 0,this.flush()}.bind(this)),this.running):void 0}clear(){this._q=[]}length(){return this._q.length}pause(){this.paused=!0}stop(){this._q=[],this.running=!1,this.paused=!0}}},function(t,e,i){"use strict";var n=i(3),r=i.n(n),s=i(0);function o(){var t="reverse",e=function(){var t=document.createElement("div");t.dir="rtl",t.style.position="fixed",t.style.width="1px",t.style.height="1px",t.style.top="0px",t.style.left="0px",t.style.overflow="hidden";var e=document.createElement("div");e.style.width="2px";var i=document.createElement("span");i.style.width="1px",i.style.display="inline-block";var n=document.createElement("span");return n.style.width="1px",n.style.display="inline-block",e.appendChild(i),e.appendChild(n),t.appendChild(e),t}();return document.body.appendChild(e),e.scrollLeft>0?t="default":"undefined"!=typeof Element&&Element.prototype.scrollIntoView?(e.children[0].children[1].scrollIntoView(),e.scrollLeft<0&&(t="negative")):(e.scrollLeft=1,0===e.scrollLeft&&(t="negative")),document.body.removeChild(e),t}var a=i(23),h=i(21),l=i(84),c=i.n(l);var u=class{constructor(t){this.settings=t||{},this.id="epubjs-container-"+Object(s.uuid)(),this.container=this.create(this.settings),this.settings.hidden&&(this.wrapper=this.wrap(this.container))}create(t){let e=t.height,i=t.width,n=t.overflow||!1,r=t.axis||"vertical",o=t.direction;Object(s.extend)(this.settings,t),t.height&&Object(s.isNumber)(t.height)&&(e=t.height+"px"),t.width&&Object(s.isNumber)(t.width)&&(i=t.width+"px");let a=document.createElement("div");return a.id=this.id,a.classList.add("epub-container"),a.style.wordSpacing="0",a.style.lineHeight="0",a.style.verticalAlign="top",a.style.position="relative","horizontal"===r&&(a.style.display="flex",a.style.flexDirection="row",a.style.flexWrap="nowrap"),i&&(a.style.width=i),e&&(a.style.height=e),n&&("scroll"===n&&"vertical"===r?(a.style["overflow-y"]=n,a.style["overflow-x"]="hidden"):"scroll"===n&&"horizontal"===r?(a.style["overflow-y"]="hidden",a.style["overflow-x"]=n):a.style.overflow=n),o&&(a.dir=o,a.style.direction=o),o&&this.settings.fullsize&&(document.body.style.direction=o),a}wrap(t){var e=document.createElement("div");return e.style.visibility="hidden",e.style.overflow="hidden",e.style.width="0",e.style.height="0",e.appendChild(t),e}getElement(t){var e;if(Object(s.isElement)(t)?e=t:"string"==typeof t&&(e=document.getElementById(t)),!e)throw new Error("Not an Element");return e}attachTo(t){var e,i=this.getElement(t);if(i)return e=this.settings.hidden?this.wrapper:this.container,i.appendChild(e),this.element=i,i}getContainer(){return this.container}onResize(t){Object(s.isNumber)(this.settings.width)&&Object(s.isNumber)(this.settings.height)||(this.resizeFunc=c()(t,50),window.addEventListener("resize",this.resizeFunc,!1))}onOrientationChange(t){this.orientationChangeFunc=t,window.addEventListener("orientationchange",this.orientationChangeFunc,!1)}size(t,e){var i;let n=t||this.settings.width,r=e||this.settings.height;null===t?(i=this.element.getBoundingClientRect()).width&&(t=Math.floor(i.width),this.container.style.width=t+"px"):Object(s.isNumber)(t)?this.container.style.width=t+"px":this.container.style.width=t,null===e?(i=i||this.element.getBoundingClientRect()).height&&(e=i.height,this.container.style.height=e+"px"):Object(s.isNumber)(e)?this.container.style.height=e+"px":this.container.style.height=e,Object(s.isNumber)(t)||(t=this.container.clientWidth),Object(s.isNumber)(e)||(e=this.container.clientHeight),this.containerStyles=window.getComputedStyle(this.container),this.containerPadding={left:parseFloat(this.containerStyles["padding-left"])||0,right:parseFloat(this.containerStyles["padding-right"])||0,top:parseFloat(this.containerStyles["padding-top"])||0,bottom:parseFloat(this.containerStyles["padding-bottom"])||0};let o=Object(s.windowBounds)(),a=window.getComputedStyle(document.body),h=parseFloat(a["padding-left"])||0,l=parseFloat(a["padding-right"])||0,c=parseFloat(a["padding-top"])||0,u=parseFloat(a["padding-bottom"])||0;return n||(t=o.width-h-l),(this.settings.fullsize&&!r||!r)&&(e=o.height-c-u),{width:t-this.containerPadding.left-this.containerPadding.right,height:e-this.containerPadding.top-this.containerPadding.bottom}}bounds(){let t;return"visible"!==this.container.style.overflow&&(t=this.container&&this.container.getBoundingClientRect()),t&&t.width&&t.height?t:Object(s.windowBounds)()}getSheet(){var t=document.createElement("style");return t.appendChild(document.createTextNode("")),document.head.appendChild(t),t.sheet}addStyleRules(t,e){var i="#"+this.id+" ",n="";this.sheet||(this.sheet=this.getSheet()),e.forEach((function(t){for(var e in t)t.hasOwnProperty(e)&&(n+=e+":"+t[e]+";")})),this.sheet.insertRule(i+t+" {"+n+"}",0)}axis(t){"horizontal"===t?(this.container.style.display="flex",this.container.style.flexDirection="row",this.container.style.flexWrap="nowrap"):this.container.style.display="block",this.settings.axis=t}direction(t){this.container&&(this.container.dir=t,this.container.style.direction=t),this.settings.fullsize&&(document.body.style.direction=t),this.settings.dir=t}overflow(t){this.container&&("scroll"===t&&"vertical"===this.settings.axis?(this.container.style["overflow-y"]=t,this.container.style["overflow-x"]="hidden"):"scroll"===t&&"horizontal"===this.settings.axis?(this.container.style["overflow-y"]="hidden",this.container.style["overflow-x"]=t):this.container.style.overflow=t),this.settings.overflow=t}destroy(){this.element&&(this.settings.hidden?this.wrapper:this.container,this.element.contains(this.container)&&this.element.removeChild(this.container),window.removeEventListener("resize",this.resizeFunc),window.removeEventListener("orientationChange",this.orientationChangeFunc))}};var d=class{constructor(t){this.container=t,this._views=[],this.length=0,this.hidden=!1}all(){return this._views}first(){return this._views[0]}last(){return this._views[this._views.length-1]}indexOf(t){return this._views.indexOf(t)}slice(){return this._views.slice.apply(this._views,arguments)}get(t){return this._views[t]}append(t){return this._views.push(t),this.container&&this.container.appendChild(t.element),this.length++,t}prepend(t){return this._views.unshift(t),this.container&&this.container.insertBefore(t.element,this.container.firstChild),this.length++,t}insert(t,e){return this._views.splice(e,0,t),this.container&&(e<this.container.children.length?this.container.insertBefore(t.element,this.container.children[e]):this.container.appendChild(t.element)),this.length++,t}remove(t){var e=this._views.indexOf(t);e>-1&&this._views.splice(e,1),this.destroy(t),this.length--}destroy(t){t.displayed&&t.destroy(),this.container&&this.container.removeChild(t.element),t=null}forEach(){return this._views.forEach.apply(this._views,arguments)}clear(){var t,e=this.length;if(this.length){for(var i=0;i<e;i++)t=this._views[i],this.destroy(t);this._views=[],this.length=0}}find(t){for(var e,i=this.length,n=0;n<i;n++)if((e=this._views[n]).displayed&&e.section.index==t.index)return e}displayed(){for(var t,e=[],i=this.length,n=0;n<i;n++)(t=this._views[n]).displayed&&e.push(t);return e}show(){for(var t,e=this.length,i=0;i<e;i++)(t=this._views[i]).displayed&&t.show();this.hidden=!1}hide(){for(var t,e=this.length,i=0;i<e;i++)(t=this._views[i]).displayed&&t.hide();this.hidden=!0}},f=i(1);class p{constructor(t){this.name="default",this.optsSettings=t.settings,this.View=t.view,this.request=t.request,this.renditionQueue=t.queue,this.q=new h.a(this),this.settings=Object(s.extend)(this.settings||{},{infinite:!0,hidden:!1,width:void 0,height:void 0,axis:void 0,writingMode:void 0,flow:"scrolled",ignoreClass:"",fullsize:void 0}),Object(s.extend)(this.settings,t.settings||{}),this.viewSettings={ignoreClass:this.settings.ignoreClass,axis:this.settings.axis,flow:this.settings.flow,layout:this.layout,method:this.settings.method,width:0,height:0,forceEvenPages:!0},this.rendered=!1}render(t,e){let i=t.tagName;void 0!==this.settings.fullsize||!i||"body"!=i.toLowerCase()&&"html"!=i.toLowerCase()||(this.settings.fullsize=!0),this.settings.fullsize&&(this.settings.overflow="visible",this.overflow=this.settings.overflow),this.settings.size=e,this.settings.rtlScrollType=o(),this.stage=new u({width:e.width,height:e.height,overflow:this.overflow,hidden:this.settings.hidden,axis:this.settings.axis,fullsize:this.settings.fullsize,direction:this.settings.direction}),this.stage.attachTo(t),this.container=this.stage.getContainer(),this.views=new d(this.container),this._bounds=this.bounds(),this._stageSize=this.stage.size(),this.viewSettings.width=this._stageSize.width,this.viewSettings.height=this._stageSize.height,this.stage.onResize(this.onResized.bind(this)),this.stage.onOrientationChange(this.onOrientationChange.bind(this)),this.addEventListeners(),this.layout&&this.updateLayout(),this.rendered=!0}addEventListeners(){var t;window.addEventListener("unload",function(t){this.destroy()}.bind(this)),t=this.settings.fullsize?window:this.container,this._onScroll=this.onScroll.bind(this),t.addEventListener("scroll",this._onScroll)}removeEventListeners(){(this.settings.fullsize?window:this.container).removeEventListener("scroll",this._onScroll),this._onScroll=void 0}destroy(){clearTimeout(this.orientationTimeout),clearTimeout(this.resizeTimeout),clearTimeout(this.afterScrolled),this.clear(),this.removeEventListeners(),this.stage.destroy(),this.rendered=!1}onOrientationChange(t){let{orientation:e}=window;this.optsSettings.resizeOnOrientationChange&&this.resize(),clearTimeout(this.orientationTimeout),this.orientationTimeout=setTimeout(function(){this.orientationTimeout=void 0,this.optsSettings.resizeOnOrientationChange&&this.resize(),this.emit(f.c.MANAGERS.ORIENTATION_CHANGE,e)}.bind(this),500)}onResized(t){this.resize()}resize(t,e,i){let n=this.stage.size(t,e);this.winBounds=Object(s.windowBounds)(),this.orientationTimeout&&this.winBounds.width===this.winBounds.height?this._stageSize=void 0:this._stageSize&&this._stageSize.width===n.width&&this._stageSize.height===n.height||(this._stageSize=n,this._bounds=this.bounds(),this.clear(),this.viewSettings.width=this._stageSize.width,this.viewSettings.height=this._stageSize.height,this.updateLayout(),this.emit(f.c.MANAGERS.RESIZED,{width:this._stageSize.width,height:this._stageSize.height},i))}createView(t,e){return new this.View(t,Object(s.extend)(this.viewSettings,{forceRight:e}))}handleNextPrePaginated(t,e,i){let n;if("pre-paginated"===this.layout.name&&this.layout.divisor>1){if(t||0===e.index)return;if(n=e.next(),n&&!n.properties.includes("page-spread-left"))return i.call(this,n)}}display(t,e){var i=new s.defer,n=i.promise;(e===t.href||Object(s.isNumber)(e))&&(e=void 0);var r=this.views.find(t);if(r&&t&&"pre-paginated"!==this.layout.name){let t=r.offset();if("ltr"===this.settings.direction)this.scrollTo(t.left,t.top,!0);else{let e=r.width();this.scrollTo(t.left+e,t.top,!0)}if(e){let t=r.locationOf(e);this.moveTo(t)}return i.resolve(),n}this.clear();let o=!1;return"pre-paginated"===this.layout.name&&2===this.layout.divisor&&t.properties.includes("page-spread-right")&&(o=!0),this.add(t,o).then(function(t){if(e){let i=t.locationOf(e);this.moveTo(i)}}.bind(this),t=>{i.reject(t)}).then(function(){return this.handleNextPrePaginated(o,t,this.add)}.bind(this)).then(function(){this.views.show(),i.resolve()}.bind(this)),n}afterDisplayed(t){this.emit(f.c.MANAGERS.ADDED,t)}afterResized(t){this.emit(f.c.MANAGERS.RESIZE,t.section)}moveTo(t){var e=0,i=0;this.isPaginated?(e=Math.floor(t.left/this.layout.delta)*this.layout.delta)+this.layout.delta>this.container.scrollWidth&&(e=this.container.scrollWidth-this.layout.delta):i=t.top,this.scrollTo(e,i,!0)}add(t,e){var i=this.createView(t,e);return this.views.append(i),i.onDisplayed=this.afterDisplayed.bind(this),i.onResize=this.afterResized.bind(this),i.on(f.c.VIEWS.AXIS,t=>{this.updateAxis(t)}),i.on(f.c.VIEWS.WRITING_MODE,t=>{this.updateWritingMode(t)}),i.display(this.request)}append(t,e){var i=this.createView(t,e);return this.views.append(i),i.onDisplayed=this.afterDisplayed.bind(this),i.onResize=this.afterResized.bind(this),i.on(f.c.VIEWS.AXIS,t=>{this.updateAxis(t)}),i.on(f.c.VIEWS.WRITING_MODE,t=>{this.updateWritingMode(t)}),i.display(this.request)}prepend(t,e){var i=this.createView(t,e);return i.on(f.c.VIEWS.RESIZED,t=>{this.counter(t)}),this.views.prepend(i),i.onDisplayed=this.afterDisplayed.bind(this),i.onResize=this.afterResized.bind(this),i.on(f.c.VIEWS.AXIS,t=>{this.updateAxis(t)}),i.on(f.c.VIEWS.WRITING_MODE,t=>{this.updateWritingMode(t)}),i.display(this.request)}counter(t){"vertical"===this.settings.axis?this.scrollBy(0,t.heightDelta,!0):this.scrollBy(t.widthDelta,0,!0)}next(){var t;let e=this.settings.direction;if(this.views.length){if(!this.isPaginated||"horizontal"!==this.settings.axis||e&&"ltr"!==e)if(this.isPaginated&&"horizontal"===this.settings.axis&&"rtl"===e)this.scrollLeft=this.container.scrollLeft,"default"===this.settings.rtlScrollType?this.container.scrollLeft>0?this.scrollBy(this.layout.delta,0,!0):t=this.views.last().section.next():this.container.scrollLeft+-1*this.layout.delta>-1*this.container.scrollWidth?this.scrollBy(this.layout.delta,0,!0):t=this.views.last().section.next();else if(this.isPaginated&&"vertical"===this.settings.axis){this.scrollTop=this.container.scrollTop,this.container.scrollTop+this.container.offsetHeight<this.container.scrollHeight?this.scrollBy(0,this.layout.height,!0):t=this.views.last().section.next()}else t=this.views.last().section.next();else this.scrollLeft=this.container.scrollLeft,this.container.scrollLeft+this.container.offsetWidth+this.layout.delta<=this.container.scrollWidth?this.scrollBy(this.layout.delta,0,!0):t=this.views.last().section.next();if(t){this.clear();let e=!1;return"pre-paginated"===this.layout.name&&2===this.layout.divisor&&t.properties.includes("page-spread-right")&&(e=!0),this.append(t,e).then(function(){return this.handleNextPrePaginated(e,t,this.append)}.bind(this),t=>t).then(function(){this.isPaginated||"horizontal"!==this.settings.axis||"rtl"!==this.settings.direction||"default"!==this.settings.rtlScrollType||this.scrollTo(this.container.scrollWidth,0,!0),this.views.show()}.bind(this))}}}prev(){var t;let e=this.settings.direction;if(this.views.length){if(!this.isPaginated||"horizontal"!==this.settings.axis||e&&"ltr"!==e)if(this.isPaginated&&"horizontal"===this.settings.axis&&"rtl"===e)this.scrollLeft=this.container.scrollLeft,"default"===this.settings.rtlScrollType?this.container.scrollLeft+this.container.offsetWidth<this.container.scrollWidth?this.scrollBy(-this.layout.delta,0,!0):t=this.views.first().section.prev():this.container.scrollLeft<0?this.scrollBy(-this.layout.delta,0,!0):t=this.views.first().section.prev();else if(this.isPaginated&&"vertical"===this.settings.axis){this.scrollTop=this.container.scrollTop,this.container.scrollTop>0?this.scrollBy(0,-this.layout.height,!0):t=this.views.first().section.prev()}else t=this.views.first().section.prev();else this.scrollLeft=this.container.scrollLeft,this.container.scrollLeft>0?this.scrollBy(-this.layout.delta,0,!0):t=this.views.first().section.prev();if(t){this.clear();let e=!1;return"pre-paginated"===this.layout.name&&2===this.layout.divisor&&"object"!=typeof t.prev()&&(e=!0),this.prepend(t,e).then(function(){var e;if("pre-paginated"===this.layout.name&&this.layout.divisor>1&&(e=t.prev()))return this.prepend(e)}.bind(this),t=>t).then(function(){this.isPaginated&&"horizontal"===this.settings.axis&&("rtl"===this.settings.direction?"default"===this.settings.rtlScrollType?this.scrollTo(0,0,!0):this.scrollTo(-1*this.container.scrollWidth+this.layout.delta,0,!0):this.scrollTo(this.container.scrollWidth-this.layout.delta,0,!0)),this.views.show()}.bind(this))}}}current(){var t=this.visible();return t.length?t[t.length-1]:null}clear(){this.views&&(this.views.hide(),this.scrollTo(0,0,!0),this.views.clear())}currentLocation(){return this.isPaginated&&"horizontal"===this.settings.axis?this.location=this.paginatedLocation():this.location=this.scrolledLocation(),this.location}scrolledLocation(){let t=this.visible(),e=this.container.getBoundingClientRect(),i=e.height<window.innerHeight?e.height:window.innerHeight,n=e.width<window.innerWidth?e.width:window.innerWidth,r="vertical"===this.settings.axis,s=(this.settings.direction,0);return this.settings.fullsize&&(s=r?window.scrollY:window.scrollX),t.map(t=>{let o,a,h,l,{index:c,href:u}=t.section,d=t.position(),f=t.width(),p=t.height();r?(o=s+e.top-d.top+0,a=o+i-0,l=this.layout.count(p,i).pages,h=i):(o=s+e.left-d.left+0,a=o+n-0,l=this.layout.count(f,n).pages,h=n);let g=Math.ceil(o/h),v=[],m=Math.ceil(a/h);if("rtl"===this.settings.direction&&!r){let t=g;g=l-m,m=l-t}v=[];for(var y=g;y<=m;y++){let t=y+1;v.push(t)}return{index:c,href:u,pages:v,totalPages:l,mapping:this.mapping.page(t.contents,t.section.cfiBase,o,a)}})}paginatedLocation(){let t=this.visible(),e=this.container.getBoundingClientRect(),i=0,n=0;return this.settings.fullsize&&(i=window.scrollX),t.map(t=>{let r,s,o,a,{index:h,href:l}=t.section,c=t.position(),u=t.width();"rtl"===this.settings.direction?(r=e.right-i,a=Math.min(Math.abs(r-c.left),this.layout.width)-n,o=c.width-(c.right-r)-n,s=o-a):(r=e.left+i,a=Math.min(c.right-r,this.layout.width)-n,s=r-c.left+n,o=s+a),n+=a;let d=this.mapping.page(t.contents,t.section.cfiBase,s,o),f=this.layout.count(u).pages,p=Math.floor(s/this.layout.pageWidth),g=[],v=Math.floor(o/this.layout.pageWidth);if(p<0&&(p=0,v+=1),"rtl"===this.settings.direction){let t=p;p=f-v,v=f-t}for(var m=p+1;m<=v;m++){let t=m;g.push(t)}return{index:h,href:l,pages:g,totalPages:f,mapping:d}})}isVisible(t,e,i,n){var r=t.position(),s=n||this.bounds();return"horizontal"===this.settings.axis&&r.right>s.left-e&&r.left<s.right+i||"vertical"===this.settings.axis&&r.bottom>s.top-e&&r.top<s.bottom+i}visible(){for(var t,e=this.bounds(),i=this.views.displayed(),n=i.length,r=[],s=0;s<n;s++)t=i[s],!0===this.isVisible(t,0,0,e)&&r.push(t);return r}scrollBy(t,e,i){let n="rtl"===this.settings.direction?-1:1;i&&(this.ignore=!0),this.settings.fullsize?window.scrollBy(t*n,e*n):(t&&(this.container.scrollLeft+=t*n),e&&(this.container.scrollTop+=e)),this.scrolled=!0}scrollTo(t,e,i){i&&(this.ignore=!0),this.settings.fullsize?window.scrollTo(t,e):(this.container.scrollLeft=t,this.container.scrollTop=e),this.scrolled=!0}onScroll(){let t,e;this.settings.fullsize?(t=window.scrollY,e=window.scrollX):(t=this.container.scrollTop,e=this.container.scrollLeft),this.scrollTop=t,this.scrollLeft=e,this.ignore?this.ignore=!1:(this.emit(f.c.MANAGERS.SCROLL,{top:t,left:e}),clearTimeout(this.afterScrolled),this.afterScrolled=setTimeout(function(){this.emit(f.c.MANAGERS.SCROLLED,{top:this.scrollTop,left:this.scrollLeft})}.bind(this),20))}bounds(){return this.stage.bounds()}applyLayout(t){this.layout=t,this.updateLayout(),this.views&&this.views.length>0&&"pre-paginated"===this.layout.name&&this.display(this.views.first().section)}updateLayout(){this.stage&&(this._stageSize=this.stage.size(),this.isPaginated?(this.layout.calculate(this._stageSize.width,this._stageSize.height,this.settings.gap),this.settings.offset=this.layout.delta/this.layout.divisor):this.layout.calculate(this._stageSize.width,this._stageSize.height),this.viewSettings.width=this.layout.width,this.viewSettings.height=this.layout.height,this.setLayout(this.layout))}setLayout(t){this.viewSettings.layout=t,this.mapping=new a.a(t.props,this.settings.direction,this.settings.axis),this.views&&this.views.forEach((function(e){e&&e.setLayout(t)}))}updateWritingMode(t){this.writingMode=t}updateAxis(t,e){(e||t!==this.settings.axis)&&(this.settings.axis=t,this.stage&&this.stage.axis(t),this.viewSettings.axis=t,this.mapping&&(this.mapping=new a.a(this.layout.props,this.settings.direction,this.settings.axis)),this.layout&&("vertical"===t?this.layout.spread("none"):this.layout.spread(this.layout.settings.spread)))}updateFlow(t,e="auto"){let i="paginated"===t||"auto"===t;this.isPaginated=i,"scrolled-doc"===t||"scrolled-continuous"===t||"scrolled"===t?this.updateAxis("vertical"):this.updateAxis("horizontal"),this.viewSettings.flow=t,this.settings.overflow?this.overflow=this.settings.overflow:this.overflow=i?"hidden":e,this.stage&&this.stage.overflow(this.overflow),this.updateLayout()}getContents(){var t=[];return this.views?(this.views.forEach((function(e){const i=e&&e.contents;i&&t.push(i)})),t):t}direction(t="ltr"){this.settings.direction=t,this.stage&&this.stage.direction(t),this.viewSettings.direction=t,this.updateLayout()}isRendered(){return this.rendered}}r()(p.prototype);e.a=p},function(t,e,i){"use strict";var n=i(2),r=i(0);e.a=class{constructor(t,e,i,n=!1){this.layout=t,this.horizontal="horizontal"===i,this.direction=e||"ltr",this._dev=n}section(t){var e=this.findRanges(t);return this.rangeListToCfiList(t.section.cfiBase,e)}page(t,e,i,r){var s,o=!(!t||!t.document)&&t.document.body;if(o){if(s=this.rangePairToCfiPair(e,{start:this.findStart(o,i,r),end:this.findEnd(o,i,r)}),!0===this._dev){let e=t.document,i=new n.a(s.start).toRange(e),r=new n.a(s.end).toRange(e),o=e.defaultView.getSelection(),a=e.createRange();o.removeAllRanges(),a.setStart(i.startContainer,i.startOffset),a.setEnd(r.endContainer,r.endOffset),o.addRange(a)}return s}}walk(t,e){if(!t||t.nodeType!==Node.TEXT_NODE){var i=function(t){return t.data.trim().length>0?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_REJECT},n=i;n.acceptNode=i;for(var r,s,o=document.createTreeWalker(t,NodeFilter.SHOW_TEXT,n,!1);(r=o.nextNode())&&!(s=e(r)););return s}}findRanges(t){for(var e,i,n=[],r=t.contents.scrollWidth(),s=Math.ceil(r/this.layout.spreadWidth)*this.layout.divisor,o=this.layout.columnWidth,a=this.layout.gap,h=0;h<s.pages;h++)e=(o+a)*h,i=o*(h+1)+a*h,n.push({start:this.findStart(t.document.body,e,i),end:this.findEnd(t.document.body,e,i)});return n}findStart(t,e,i){for(var n,s,o=[t],a=t;o.length;)if(n=o.shift(),s=this.walk(n,t=>{var n,s,h,l,c;if(c=Object(r.nodeBounds)(t),this.horizontal&&"ltr"===this.direction){if(n=this.horizontal?c.left:c.top,s=this.horizontal?c.right:c.bottom,n>=e&&n<=i)return t;if(s>e)return t;a=t,o.push(t)}else if(this.horizontal&&"rtl"===this.direction){if(n=c.left,(s=c.right)<=i&&s>=e)return t;if(n<i)return t;a=t,o.push(t)}else{if(h=c.top,l=c.bottom,h>=e&&h<=i)return t;if(l>e)return t;a=t,o.push(t)}}))return this.findTextStartRange(s,e,i);return this.findTextStartRange(a,e,i)}findEnd(t,e,i){for(var n,s,o=[t],a=t;o.length;)if(n=o.shift(),s=this.walk(n,t=>{var n,s,h,l,c;if(c=Object(r.nodeBounds)(t),this.horizontal&&"ltr"===this.direction){if(n=Math.round(c.left),s=Math.round(c.right),n>i&&a)return a;if(s>i)return t;a=t,o.push(t)}else if(this.horizontal&&"rtl"===this.direction){if(n=Math.round(this.horizontal?c.left:c.top),(s=Math.round(this.horizontal?c.right:c.bottom))<e&&a)return a;if(n<e)return t;a=t,o.push(t)}else{if(h=Math.round(c.top),l=Math.round(c.bottom),h>i&&a)return a;if(l>i)return t;a=t,o.push(t)}}))return this.findTextEndRange(s,e,i);return this.findTextEndRange(a,e,i)}findTextStartRange(t,e,i){for(var n,r,s=this.splitTextNodeIntoRanges(t),o=0;o<s.length;o++)if(r=(n=s[o]).getBoundingClientRect(),this.horizontal&&"ltr"===this.direction){if(r.left>=e)return n}else if(this.horizontal&&"rtl"===this.direction){if(r.right<=i)return n}else if(r.top>=e)return n;return s[0]}findTextEndRange(t,e,i){for(var n,r,s,o,a,h,l,c=this.splitTextNodeIntoRanges(t),u=0;u<c.length;u++){if(s=(r=c[u]).getBoundingClientRect(),this.horizontal&&"ltr"===this.direction){if(o=s.left,a=s.right,o>i&&n)return n;if(a>i)return r}else if(this.horizontal&&"rtl"===this.direction){if(o=s.left,(a=s.right)<e&&n)return n;if(o<e)return r}else{if(h=s.top,l=s.bottom,h>i&&n)return n;if(l>i)return r}n=r}return c[c.length-1]}splitTextNodeIntoRanges(t,e){var i,n=[],r=(t.textContent||"").trim(),s=t.ownerDocument,o=e||" ",a=r.indexOf(o);if(-1===a||t.nodeType!=Node.TEXT_NODE)return(i=s.createRange()).selectNodeContents(t),[i];for((i=s.createRange()).setStart(t,0),i.setEnd(t,a),n.push(i),i=!1;-1!=a;)(a=r.indexOf(o,a+1))>0&&(i&&(i.setEnd(t,a),n.push(i)),(i=s.createRange()).setStart(t,a+1));return i&&(i.setEnd(t,r.length),n.push(i)),n}rangePairToCfiPair(t,e){var i=e.start,r=e.end;return i.collapse(!0),r.collapse(!1),{start:new n.a(i,t).toString(),end:new n.a(r,t).toString()}}rangeListToCfiList(t,e){for(var i,n=[],r=0;r<e.length;r++)i=this.rangePairToCfiPair(t,e[r]),n.push(i);return n}axis(t){return t&&(this.horizontal="horizontal"===t),this.horizontal}}},function(t,e,i){"use strict";var n=i(87),r=i(13),s=i(36),o=i(46),a=i(35),h=i(33),l=i(100),c=i(101),u=Math.max,d=Math.min,f=Math.floor,p=/\$([$&'`]|\d\d?|<[^>]*>)/g,g=/\$([$&'`]|\d\d?)/g;n("replace",2,(function(t,e,i,n){var v=n.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,m=n.REPLACE_KEEPS_$0,y=v?"$":"$0";return[function(i,n){var r=h(this),s=null==i?void 0:i[t];return void 0!==s?s.call(i,r,n):e.call(String(r),i,n)},function(t,n){if(!v&&m||"string"==typeof n&&-1===n.indexOf(y)){var s=i(e,t,this,n);if(s.done)return s.value}var h=r(t),f=String(this),p="function"==typeof n;p||(n=String(n));var g=h.global;if(g){var w=h.unicode;h.lastIndex=0}for(var x=[];;){var E=c(h,f);if(null===E)break;if(x.push(E),!g)break;""===String(E[0])&&(h.lastIndex=l(f,o(h.lastIndex),w))}for(var S,_="",O=0,C=0;C<x.length;C++){E=x[C];for(var T=String(E[0]),k=u(d(a(E.index),f.length),0),R=[],L=1;L<E.length;L++)R.push(void 0===(S=E[L])?S:String(S));var I=E.groups;if(p){var j=[T].concat(R,k,f);void 0!==I&&j.push(I);var N=String(n.apply(void 0,j))}else N=b(T,f,k,R,I,n);k>=O&&(_+=f.slice(O,k)+N,O=k+T.length)}return _+f.slice(O)}];function b(t,i,n,r,o,a){var h=n+t.length,l=r.length,c=g;return void 0!==o&&(o=s(o),c=p),e.call(a,c,(function(e,s){var a;switch(s.charAt(0)){case"$":return"$";case"&":return t;case"`":return i.slice(0,n);case"'":return i.slice(h);case"<":a=o[s.slice(1,-1)];break;default:var c=+s;if(0===c)return e;if(c>l){var u=f(c/10);return 0===u?e:u<=l?void 0===r[u-1]?s.charAt(1):r[u-1]+s.charAt(1):e}a=r[c-1]}return void 0===a?"":a}))}}))},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e,i){var n,r,s,o=i(89),a=i(7),h=i(17),l=i(15),c=i(10),u=i(43),d=i(44),f=a.WeakMap;if(o){var p=new f,g=p.get,v=p.has,m=p.set;n=function(t,e){return m.call(p,t,e),e},r=function(t){return g.call(p,t)||{}},s=function(t){return v.call(p,t)}}else{var y=u("state");d[y]=!0,n=function(t,e){return l(t,y,e),e},r=function(t){return c(t,y)?t[y]:{}},s=function(t){return c(t,y)}}t.exports={set:n,get:r,has:s,enforce:function(t){return s(t)?r(t):n(t,{})},getterFor:function(t){return function(e){var i;if(!h(e)||(i=r(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return i}}}},function(t,e){t.exports={}},function(t,e,i){"use strict";var n=i(3),r=i.n(n),s=i(0),o=i(2),a=i(23),h=i(11),l=i(1);const c="undefined"!=typeof navigator,u=c&&/Chrome/.test(navigator.userAgent),d=c&&!u&&/AppleWebKit/.test(navigator.userAgent);class f{constructor(t,e,i,n){this.epubcfi=new o.a,this.document=t,this.documentElement=this.document.documentElement,this.content=e||this.document.body,this.window=this.document.defaultView,this._size={width:0,height:0},this.sectionIndex=n||0,this.cfiBase=i||"",this.epubReadingSystem("epub.js",l.b),this.called=0,this.active=!0,this.listeners()}static get listenedEvents(){return l.a}width(t){var e=this.content;return t&&Object(s.isNumber)(t)&&(t+="px"),t&&(e.style.width=t),parseInt(this.window.getComputedStyle(e).width)}height(t){var e=this.content;return t&&Object(s.isNumber)(t)&&(t+="px"),t&&(e.style.height=t),parseInt(this.window.getComputedStyle(e).height)}contentWidth(t){var e=this.content||this.document.body;return t&&Object(s.isNumber)(t)&&(t+="px"),t&&(e.style.width=t),parseInt(this.window.getComputedStyle(e).width)}contentHeight(t){var e=this.content||this.document.body;return t&&Object(s.isNumber)(t)&&(t+="px"),t&&(e.style.height=t),parseInt(this.window.getComputedStyle(e).height)}textWidth(){let t,e,i=this.document.createRange(),n=this.content||this.document.body,r=Object(s.borders)(n);return i.selectNodeContents(n),t=i.getBoundingClientRect(),e=t.width,r&&r.width&&(e+=r.width),Math.round(e)}textHeight(){let t,e,i=this.document.createRange(),n=this.content||this.document.body;return i.selectNodeContents(n),t=i.getBoundingClientRect(),e=t.bottom,Math.round(e)}scrollWidth(){return this.documentElement.scrollWidth}scrollHeight(){return this.documentElement.scrollHeight}overflow(t){return t&&(this.documentElement.style.overflow=t),this.window.getComputedStyle(this.documentElement).overflow}overflowX(t){return t&&(this.documentElement.style.overflowX=t),this.window.getComputedStyle(this.documentElement).overflowX}overflowY(t){return t&&(this.documentElement.style.overflowY=t),this.window.getComputedStyle(this.documentElement).overflowY}css(t,e,i){var n=this.content||this.document.body;return e?n.style.setProperty(t,e,i?"important":""):n.style.removeProperty(t),this.window.getComputedStyle(n)[t]}viewport(t){var e,i=this.document.querySelector("meta[name='viewport']"),n={width:void 0,height:void 0,scale:void 0,minimum:void 0,maximum:void 0,scalable:void 0},r=[];if(i&&i.hasAttribute("content")){let t=i.getAttribute("content"),e=t.match(/width\s*=\s*([^,]*)/),r=t.match(/height\s*=\s*([^,]*)/),s=t.match(/initial-scale\s*=\s*([^,]*)/),o=t.match(/minimum-scale\s*=\s*([^,]*)/),a=t.match(/maximum-scale\s*=\s*([^,]*)/),h=t.match(/user-scalable\s*=\s*([^,]*)/);e&&e.length&&void 0!==e[1]&&(n.width=e[1]),r&&r.length&&void 0!==r[1]&&(n.height=r[1]),s&&s.length&&void 0!==s[1]&&(n.scale=s[1]),o&&o.length&&void 0!==o[1]&&(n.minimum=o[1]),a&&a.length&&void 0!==a[1]&&(n.maximum=a[1]),h&&h.length&&void 0!==h[1]&&(n.scalable=h[1])}return e=Object(s.defaults)(t||{},n),t&&(e.width&&r.push("width="+e.width),e.height&&r.push("height="+e.height),e.scale&&r.push("initial-scale="+e.scale),"no"===e.scalable?(r.push("minimum-scale="+e.scale),r.push("maximum-scale="+e.scale),r.push("user-scalable="+e.scalable)):(e.scalable&&r.push("user-scalable="+e.scalable),e.minimum&&r.push("minimum-scale="+e.minimum),e.maximum&&r.push("minimum-scale="+e.maximum)),i||((i=this.document.createElement("meta")).setAttribute("name","viewport"),this.document.querySelector("head").appendChild(i)),i.setAttribute("content",r.join(", ")),this.window.scrollTo(0,0)),e}expand(){this.emit(l.c.CONTENTS.EXPAND)}listeners(){this.imageLoadListeners(),this.mediaQueryListeners(),this.addEventListeners(),this.addSelectionListeners(),"undefined"==typeof ResizeObserver?(this.resizeListeners(),this.visibilityListeners()):this.resizeObservers(),this.linksHandler()}removeListeners(){this.removeEventListeners(),this.removeSelectionListeners(),this.observer&&this.observer.disconnect(),clearTimeout(this.expanding)}resizeCheck(){let t=this.textWidth(),e=this.textHeight();t==this._size.width&&e==this._size.height||(this._size={width:t,height:e},this.onResize&&this.onResize(this._size),this.emit(l.c.CONTENTS.RESIZE,this._size))}resizeListeners(){clearTimeout(this.expanding),requestAnimationFrame(this.resizeCheck.bind(this)),this.expanding=setTimeout(this.resizeListeners.bind(this),350)}visibilityListeners(){document.addEventListener("visibilitychange",()=>{"visible"===document.visibilityState&&!1===this.active?(this.active=!0,this.resizeListeners()):(this.active=!1,clearTimeout(this.expanding))})}transitionListeners(){let t=this.content;t.style.transitionProperty="font, font-size, font-size-adjust, font-stretch, font-variation-settings, font-weight, width, height",t.style.transitionDuration="0.001ms",t.style.transitionTimingFunction="linear",t.style.transitionDelay="0",this._resizeCheck=this.resizeCheck.bind(this),this.document.addEventListener("transitionend",this._resizeCheck)}mediaQueryListeners(){for(var t=this.document.styleSheets,e=function(t){t.matches&&!this._expanding&&setTimeout(this.expand.bind(this),1)}.bind(this),i=0;i<t.length;i+=1){var n;try{n=t[i].cssRules}catch(t){return}if(!n)return;for(var r=0;r<n.length;r+=1){if(n[r].media)this.window.matchMedia(n[r].media.mediaText).addListener(e)}}}resizeObservers(){this.observer=new ResizeObserver(t=>{requestAnimationFrame(this.resizeCheck.bind(this))}),this.observer.observe(this.document.documentElement)}mutationObservers(){this.observer=new MutationObserver(t=>{this.resizeCheck()});this.observer.observe(this.document,{attributes:!0,childList:!0,characterData:!0,subtree:!0})}imageLoadListeners(){for(var t,e=this.document.querySelectorAll("img"),i=0;i<e.length;i++)void 0!==(t=e[i]).naturalWidth&&0===t.naturalWidth&&(t.onload=this.expand.bind(this))}fontLoadListeners(){this.document&&this.document.fonts&&this.document.fonts.ready.then(function(){this.resizeCheck()}.bind(this))}root(){return this.document?this.document.documentElement:null}locationOf(t,e){var i,n={left:0,top:0};if(!this.document)return n;if(this.epubcfi.isCfiString(t)){let r=new o.a(t).toRange(this.document,e);if(r){try{if(!r.endContainer||r.startContainer==r.endContainer&&r.startOffset==r.endOffset){let t=r.startContainer.textContent.indexOf(" ",r.startOffset);-1==t&&(t=r.startContainer.textContent.length),r.setEnd(r.startContainer,t)}}catch(t){console.error("setting end offset to start container length failed",t)}if(r.startContainer.nodeType===Node.ELEMENT_NODE)i=r.startContainer.getBoundingClientRect(),n.left=i.left,n.top=i.top;else if(d){let t=r.startContainer,e=new Range;try{1===t.nodeType?i=t.getBoundingClientRect():r.startOffset+2<t.length?(e.setStart(t,r.startOffset),e.setEnd(t,r.startOffset+2),i=e.getBoundingClientRect()):r.startOffset-2>0?(e.setStart(t,r.startOffset-2),e.setEnd(t,r.startOffset),i=e.getBoundingClientRect()):i=t.parentNode.getBoundingClientRect()}catch(t){console.error(t,t.stack)}}else i=r.getBoundingClientRect()}}else if("string"==typeof t&&t.indexOf("#")>-1){let e=t.substring(t.indexOf("#")+1),n=this.document.getElementById(e);if(n)if(d){let t=new Range;t.selectNode(n),i=t.getBoundingClientRect()}else i=n.getBoundingClientRect()}return i&&(n.left=i.left,n.top=i.top),n}addStylesheet(t){return new Promise(function(e,i){var n,r=!1;this.document?(n=this.document.querySelector("link[href='"+t+"']"))?e(!0):((n=this.document.createElement("link")).type="text/css",n.rel="stylesheet",n.href=t,n.onload=n.onreadystatechange=function(){r||this.readyState&&"complete"!=this.readyState||(r=!0,setTimeout(()=>{e(!0)},1))},this.document.head.appendChild(n)):e(!1)}.bind(this))}_getStylesheetNode(t){var e;return t="epubjs-inserted-css-"+(t||""),!!this.document&&((e=this.document.getElementById(t))||((e=this.document.createElement("style")).id=t,this.document.head.appendChild(e)),e)}addStylesheetCss(t,e){return!(!this.document||!t)&&(this._getStylesheetNode(e).innerHTML=t,!0)}addStylesheetRules(t,e){var i;if(this.document&&t&&0!==t.length)if(i=this._getStylesheetNode(e).sheet,"[object Array]"===Object.prototype.toString.call(t))for(var n=0,r=t.length;n<r;n++){var s=1,o=t[n],a=t[n][0],h="";"[object Array]"===Object.prototype.toString.call(o[1][0])&&(o=o[1],s=0);for(var l=o.length;s<l;s++){var c=o[s];h+=c[0]+":"+c[1]+(c[2]?" !important":"")+";\n"}i.insertRule(a+"{"+h+"}",i.cssRules.length)}else{Object.keys(t).forEach(e=>{const n=t[e];if(Array.isArray(n))n.forEach(t=>{const n=Object.keys(t).map(e=>`${e}:${t[e]}`).join(";");i.insertRule(`${e}{${n}}`,i.cssRules.length)});else{const t=Object.keys(n).map(t=>`${t}:${n[t]}`).join(";");i.insertRule(`${e}{${t}}`,i.cssRules.length)}})}}addScript(t){return new Promise(function(e,i){var n,r=!1;this.document?((n=this.document.createElement("script")).type="text/javascript",n.async=!0,n.src=t,n.onload=n.onreadystatechange=function(){r||this.readyState&&"complete"!=this.readyState||(r=!0,setTimeout((function(){e(!0)}),1))},this.document.head.appendChild(n)):e(!1)}.bind(this))}addClass(t){var e;this.document&&(e=this.content||this.document.body)&&e.classList.add(t)}removeClass(t){var e;this.document&&(e=this.content||this.document.body)&&e.classList.remove(t)}addEventListeners(){this.document&&(this._triggerEvent=this.triggerEvent.bind(this),l.a.forEach((function(t){this.document.addEventListener(t,this._triggerEvent,{passive:!0})}),this))}removeEventListeners(){this.document&&(l.a.forEach((function(t){this.document.removeEventListener(t,this._triggerEvent,{passive:!0})}),this),this._triggerEvent=void 0)}triggerEvent(t){this.emit(t.type,t)}addSelectionListeners(){this.document&&(this._onSelectionChange=this.onSelectionChange.bind(this),this.document.addEventListener("selectionchange",this._onSelectionChange,{passive:!0}))}removeSelectionListeners(){this.document&&(this.document.removeEventListener("selectionchange",this._onSelectionChange,{passive:!0}),this._onSelectionChange=void 0)}onSelectionChange(t){this.selectionEndTimeout&&clearTimeout(this.selectionEndTimeout),this.selectionEndTimeout=setTimeout(function(){var t=this.window.getSelection();this.triggerSelectedEvent(t)}.bind(this),250)}triggerSelectedEvent(t){var e,i;t&&t.rangeCount>0&&((e=t.getRangeAt(0)).collapsed||(i=new o.a(e,this.cfiBase).toString(),this.emit(l.c.CONTENTS.SELECTED,i),this.emit(l.c.CONTENTS.SELECTED_RANGE,e)))}range(t,e){return new o.a(t).toRange(this.document,e)}cfiFromRange(t,e){return new o.a(t,this.cfiBase,e).toString()}cfiFromNode(t,e){return new o.a(t,this.cfiBase,e).toString()}map(t){return new a.a(t).section()}size(t,e){var i={scale:1,scalable:"no"};this.layoutStyle("scrolling"),t>=0&&(this.width(t),i.width=t,this.css("padding","0 "+t/12+"px")),e>=0&&(this.height(e),i.height=e),this.css("margin","0"),this.css("box-sizing","border-box"),this.viewport(i)}columns(t,e,i,n,r){let o=Object(s.prefixed)("column-axis"),a=Object(s.prefixed)("column-gap"),h=Object(s.prefixed)("column-width"),l=Object(s.prefixed)("column-fill"),c=0===this.writingMode().indexOf("vertical")?"vertical":"horizontal";this.layoutStyle("paginated"),"rtl"===r&&"horizontal"===c&&this.direction(r),this.width(t),this.height(e),this.viewport({width:t,height:e,scale:1,scalable:"no"}),this.css("overflow-y","hidden"),this.css("margin","0",!0),"vertical"===c?(this.css("padding-top",n/2+"px",!0),this.css("padding-bottom",n/2+"px",!0),this.css("padding-left","20px"),this.css("padding-right","20px"),this.css(o,"vertical")):(this.css("padding-top","20px"),this.css("padding-bottom","20px"),this.css("padding-left",n/2+"px",!0),this.css("padding-right",n/2+"px",!0),this.css(o,"horizontal")),this.css("box-sizing","border-box"),this.css("max-width","inherit"),this.css(l,"auto"),this.css(a,n+"px"),this.css(h,i+"px"),this.css("-webkit-line-box-contain","block glyphs replaced")}scaler(t,e,i){var n="scale("+t+")",r="";this.css("transform-origin","top left"),(e>=0||i>=0)&&(r=" translate("+(e||0)+"px, "+(i||0)+"px )"),this.css("transform",n+r)}fit(t,e,i){var n=this.viewport(),r=parseInt(n.width),s=parseInt(n.height),o=t/r,a=e/s,h=o<a?o:a;if(this.layoutStyle("paginated"),this.width(r),this.height(s),this.overflow("hidden"),this.scaler(h,0,0),this.css("background-size",r*h+"px "+s*h+"px"),this.css("background-color","transparent"),i&&i.properties.includes("page-spread-left")){var l=t-r*h;this.css("margin-left",l+"px")}}direction(t){this.documentElement&&(this.documentElement.style.direction=t)}mapPage(t,e,i,n,r){return new a.a(e,r).page(this,t,i,n)}linksHandler(){Object(h.c)(this.content,t=>{this.emit(l.c.CONTENTS.LINK_CLICKED,t)})}writingMode(t){let e=Object(s.prefixed)("writing-mode");return t&&this.documentElement&&(this.documentElement.style[e]=t),this.window.getComputedStyle(this.documentElement)[e]||""}layoutStyle(t){return t&&(this._layoutStyle=t,navigator.epubReadingSystem.layoutStyle=this._layoutStyle),this._layoutStyle||"paginated"}epubReadingSystem(t,e){return navigator.epubReadingSystem={name:t,version:e,layoutStyle:this.layoutStyle(),hasFeature:function(t){switch(t){case"dom-manipulation":case"layout-changes":case"touch-events":case"mouse-events":case"keyboard-events":return!0;case"spine-scripting":default:return!1}}},navigator.epubReadingSystem}destroy(){this.removeListeners()}}r()(f.prototype),e.a=f},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Underline=e.Highlight=e.Mark=e.Pane=void 0;var n=function(){function t(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}return function(e,i,n){return i&&t(e.prototype,i),n&&t(e,n),e}}(),r=o(i(135)),s=o(i(136));function o(t){return t&&t.__esModule?t:{default:t}}function a(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function h(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function l(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}e.Pane=function(){function t(e){var i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.body;l(this,t),this.target=e,this.element=r.default.createElement("svg"),this.marks=[],this.element.style.position="absolute",this.element.setAttribute("pointer-events","none"),s.default.proxyMouse(this.target,this.marks),this.container=i,this.container.appendChild(this.element),this.render()}return n(t,[{key:"addMark",value:function(t){var e=r.default.createElement("g");return this.element.appendChild(e),t.bind(e,this.container),this.marks.push(t),t.render(),t}},{key:"removeMark",value:function(t){var e=this.marks.indexOf(t);if(-1!==e){var i=t.unbind();this.element.removeChild(i),this.marks.splice(e,1)}}},{key:"render",value:function(){var t,e,i,n;!function(t,e){t.style.setProperty("top",e.top+"px","important"),t.style.setProperty("left",e.left+"px","important"),t.style.setProperty("height",e.height+"px","important"),t.style.setProperty("width",e.width+"px","important")}(this.element,(t=this.target,e=this.container,i=e.getBoundingClientRect(),n=t.getBoundingClientRect(),{top:n.top-i.top,left:n.left-i.left,height:t.scrollHeight,width:t.scrollWidth}));var r=!0,s=!1,o=void 0;try{for(var a,h=this.marks[Symbol.iterator]();!(r=(a=h.next()).done);r=!0){a.value.render()}}catch(t){s=!0,o=t}finally{try{!r&&h.return&&h.return()}finally{if(s)throw o}}}}]),t}();var c=e.Mark=function(){function t(){l(this,t),this.element=null}return n(t,[{key:"bind",value:function(t,e){this.element=t,this.container=e}},{key:"unbind",value:function(){var t=this.element;return this.element=null,t}},{key:"render",value:function(){}},{key:"dispatchEvent",value:function(t){this.element&&this.element.dispatchEvent(t)}},{key:"getBoundingClientRect",value:function(){return this.element.getBoundingClientRect()}},{key:"getClientRects",value:function(){for(var t=[],e=this.element.firstChild;e;)t.push(e.getBoundingClientRect()),e=e.nextSibling;return t}},{key:"filteredRanges",value:function(){var t=Array.from(this.range.getClientRects());return t.filter((function(e){for(var i=0;i<t.length;i++){if(t[i]===e)return!0;if(n=t[i],(r=e).right<=n.right&&r.left>=n.left&&r.top>=n.top&&r.bottom<=n.bottom)return!1}var n,r;return!0}))}}]),t}(),u=e.Highlight=function(t){function e(t,i,n,r){l(this,e);var s=a(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return s.range=t,s.className=i,s.data=n||{},s.attributes=r||{},s}return h(e,t),n(e,[{key:"bind",value:function(t,i){for(var n in function t(e,i,n){null===e&&(e=Function.prototype);var r=Object.getOwnPropertyDescriptor(e,i);if(void 0===r){var s=Object.getPrototypeOf(e);return null===s?void 0:t(s,i,n)}if("value"in r)return r.value;var o=r.get;return void 0!==o?o.call(n):void 0}(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"bind",this).call(this,t,i),this.data)this.data.hasOwnProperty(n)&&(this.element.dataset[n]=this.data[n]);for(var n in this.attributes)this.attributes.hasOwnProperty(n)&&this.element.setAttribute(n,this.attributes[n]);this.className&&this.element.classList.add(this.className)}},{key:"render",value:function(){for(;this.element.firstChild;)this.element.removeChild(this.element.firstChild);for(var t=this.element.ownerDocument.createDocumentFragment(),e=this.filteredRanges(),i=this.element.getBoundingClientRect(),n=this.container.getBoundingClientRect(),s=0,o=e.length;s<o;s++){var a=e[s],h=r.default.createElement("rect");h.setAttribute("x",a.left-i.left+n.left),h.setAttribute("y",a.top-i.top+n.top),h.setAttribute("height",a.height),h.setAttribute("width",a.width),t.appendChild(h)}this.element.appendChild(t)}}]),e}(c);e.Underline=function(t){function e(t,i,n,r){return l(this,e),a(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,i,n,r))}return h(e,t),n(e,[{key:"render",value:function(){for(;this.element.firstChild;)this.element.removeChild(this.element.firstChild);for(var t=this.element.ownerDocument.createDocumentFragment(),e=this.filteredRanges(),i=this.element.getBoundingClientRect(),n=this.container.getBoundingClientRect(),s=0,o=e.length;s<o;s++){var a=e[s],h=r.default.createElement("rect");h.setAttribute("x",a.left-i.left+n.left),h.setAttribute("y",a.top-i.top+n.top),h.setAttribute("height",a.height),h.setAttribute("width",a.width),h.setAttribute("fill","none");var l=r.default.createElement("line");l.setAttribute("x1",a.left-i.left+n.left),l.setAttribute("x2",a.left-i.left+n.left+a.width),l.setAttribute("y1",a.top-i.top+n.top+a.height-1),l.setAttribute("y2",a.top-i.top+n.top+a.height-1),l.setAttribute("stroke-width",1),l.setAttribute("stroke","black"),l.setAttribute("stroke-linecap","square"),t.appendChild(h),t.appendChild(l)}this.element.appendChild(t)}}]),e}(u)},function(t,e){var i;i=function(){return this}();try{i=i||new Function("return this")()}catch(t){"object"==typeof window&&(i=window)}t.exports=i},function(t,e,i){var n=i(7),r=i(59).f,s=i(15),o=i(19),a=i(42),h=i(90),l=i(96);t.exports=function(t,e){var i,c,u,d,f,p=t.target,g=t.global,v=t.stat;if(i=g?n:v?n[p]||a(p,{}):(n[p]||{}).prototype)for(c in e){if(d=e[c],u=t.noTargetGet?(f=r(i,c))&&f.value:i[c],!l(g?c:p+(v?".":"#")+c,t.forced)&&void 0!==u){if(typeof d==typeof u)continue;h(d,u)}(t.sham||u&&u.sham)&&s(d,"sham",!0),o(i,c,d,t)}}},function(t,e,i){var n=i(61),r=i(33);t.exports=function(t){return n(r(t))}},function(t,e){t.exports=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t}},function(t,e){t.exports=!1},function(t,e){var i=Math.ceil,n=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?n:i)(t)}},function(t,e,i){var n=i(33);t.exports=function(t){return Object(n(t))}},function(t,e,i){var n=i(18).f,r=i(10),s=i(8)("toStringTag");t.exports=function(t,e,i){t&&!r(t=i?t:t.prototype,s)&&n(t,s,{configurable:!0,value:e})}},function(e,i){e.exports=t},function(t,e,i){"use strict";var n=i(3),r=i.n(n),s=i(0),o=i(6),a=i(2),h=i(21),l=i(1);class c{constructor(t){this.settings=t,this.name=t.layout||"reflowable",this._spread="none"!==t.spread,this._minSpreadWidth=t.minSpreadWidth||800,this._evenSpreads=t.evenSpreads||!1,"scrolled"===t.flow||"scrolled-continuous"===t.flow||"scrolled-doc"===t.flow?this._flow="scrolled":this._flow="paginated",this.width=0,this.height=0,this.spreadWidth=0,this.delta=0,this.columnWidth=0,this.gap=0,this.divisor=1,this.props={name:this.name,spread:this._spread,flow:this._flow,width:0,height:0,spreadWidth:0,delta:0,columnWidth:0,gap:0,divisor:1}}flow(t){return void 0!==t&&(this._flow="scrolled"===t||"scrolled-continuous"===t||"scrolled-doc"===t?"scrolled":"paginated",this.update({flow:this._flow})),this._flow}spread(t,e){return t&&(this._spread="none"!==t,this.update({spread:this._spread})),e>=0&&(this._minSpreadWidth=e),this._spread}calculate(t,e,i){var n,r,s,o,a=1,h=i||0,l=t,c=e,u=Math.floor(l/12);a=this._spread&&l>=this._minSpreadWidth?2:1,"reflowable"!==this.name||"paginated"!==this._flow||i>=0||(h=u%2==0?u:u-1),"pre-paginated"===this.name&&(h=0),a>1?s=(n=l/a-h)+h:(n=l,s=l),"pre-paginated"===this.name&&a>1&&(l=n),r=n*a+h,o=l,this.width=l,this.height=c,this.spreadWidth=r,this.pageWidth=s,this.delta=o,this.columnWidth=n,this.gap=h,this.divisor=a,this.update({width:l,height:c,spreadWidth:r,pageWidth:s,delta:o,columnWidth:n,gap:h,divisor:a})}format(t,e,i){return"pre-paginated"===this.name?t.fit(this.columnWidth,this.height,e):"paginated"===this._flow?t.columns(this.width,this.height,this.columnWidth,this.gap,this.settings.direction):i&&"horizontal"===i?t.size(null,this.height):t.size(this.width,null)}count(t,e){let i,n;return"pre-paginated"===this.name?(i=1,n=1):"paginated"===this._flow?(e=e||this.delta,i=Math.ceil(t/e),n=i*this.divisor):(e=e||this.height,i=Math.ceil(t/e),n=i),{spreads:i,pages:n}}update(t){if(Object.keys(t).forEach(e=>{this.props[e]===t[e]&&delete t[e]}),Object.keys(t).length>0){let e=Object(s.extend)(this.props,t);this.emit(l.c.LAYOUT.UPDATED,e,t)}}}r()(c.prototype);var u=c,d=i(5);var f=class{constructor(t){this.rendition=t,this._themes={default:{rules:{},url:"",serialized:""}},this._overrides={},this._current="default",this._injected=[],this.rendition.hooks.content.register(this.inject.bind(this)),this.rendition.hooks.content.register(this.overrides.bind(this))}register(){if(0!==arguments.length)return 1===arguments.length&&"object"==typeof arguments[0]?this.registerThemes(arguments[0]):1===arguments.length&&"string"==typeof arguments[0]?this.default(arguments[0]):2===arguments.length&&"string"==typeof arguments[1]?this.registerUrl(arguments[0],arguments[1]):2===arguments.length&&"object"==typeof arguments[1]?this.registerRules(arguments[0],arguments[1]):void 0}default(t){if(t)return"string"==typeof t?this.registerUrl("default",t):"object"==typeof t?this.registerRules("default",t):void 0}registerThemes(t){for(var e in t)t.hasOwnProperty(e)&&("string"==typeof t[e]?this.registerUrl(e,t[e]):this.registerRules(e,t[e]))}registerCss(t,e){this._themes[t]={serialized:e},(this._injected[t]||"default"==t)&&this.update(t)}registerUrl(t,e){var i=new d.a(e);this._themes[t]={url:i.toString()},(this._injected[t]||"default"==t)&&this.update(t)}registerRules(t,e){this._themes[t]={rules:e},(this._injected[t]||"default"==t)&&this.update(t)}select(t){var e=this._current;this._current=t,this.update(t),this.rendition.getContents().forEach(i=>{i.removeClass(e),i.addClass(t)})}update(t){this.rendition.getContents().forEach(e=>{this.add(t,e)})}inject(t){var e,i=[],n=this._themes;for(var r in n)!n.hasOwnProperty(r)||r!==this._current&&"default"!==r||(((e=n[r]).rules&&Object.keys(e.rules).length>0||e.url&&-1===i.indexOf(e.url))&&this.add(r,t),this._injected.push(r));"default"!=this._current&&t.addClass(this._current)}add(t,e){var i=this._themes[t];i&&e&&(i.url?e.addStylesheet(i.url):i.serialized?(e.addStylesheetCss(i.serialized,t),i.injected=!0):i.rules&&(e.addStylesheetRules(i.rules,t),i.injected=!0))}override(t,e,i){var n=this.rendition.getContents();this._overrides[t]={value:e,priority:!0===i},n.forEach(e=>{e.css(t,this._overrides[t].value,this._overrides[t].priority)})}removeOverride(t){var e=this.rendition.getContents();delete this._overrides[t],e.forEach(e=>{e.css(t)})}overrides(t){var e=this._overrides;for(var i in e)e.hasOwnProperty(i)&&t.css(i,e[i].value,e[i].priority)}fontSize(t){this.override("font-size",t)}font(t){this.override("font-family",t,!0)}destroy(){this.rendition=void 0,this._themes=void 0,this._overrides=void 0,this._current=void 0,this._injected=void 0}};i(28);class p{constructor({type:t,cfiRange:e,data:i,sectionIndex:n,cb:r,className:s,styles:o}){this.type=t,this.cfiRange=e,this.data=i,this.sectionIndex=n,this.mark=void 0,this.cb=r,this.className=s,this.styles=o}update(t){this.data=t}attach(t){let e,{cfiRange:i,data:n,type:r,mark:s,cb:o,className:a,styles:h}=this;return"highlight"===r?e=t.highlight(i,n,o,a,h):"underline"===r?e=t.underline(i,n,o,a,h):"mark"===r&&(e=t.mark(i,n,o)),this.mark=e,this.emit(l.c.ANNOTATION.ATTACH,e),e}detach(t){let e,{cfiRange:i,type:n}=this;return t&&("highlight"===n?e=t.unhighlight(i):"underline"===n?e=t.ununderline(i):"mark"===n&&(e=t.unmark(i))),this.mark=void 0,this.emit(l.c.ANNOTATION.DETACH,e),e}text(){}}r()(p.prototype);var g=class{constructor(t){this.rendition=t,this.highlights=[],this.underlines=[],this.marks=[],this._annotations={},this._annotationsBySectionIndex={},this.rendition.hooks.render.register(this.inject.bind(this)),this.rendition.hooks.unloaded.register(this.clear.bind(this))}add(t,e,i,n,r,s){let o=encodeURI(e+t),h=new a.a(e).spinePos,l=new p({type:t,cfiRange:e,data:i,sectionIndex:h,cb:n,className:r,styles:s});return this._annotations[o]=l,h in this._annotationsBySectionIndex?this._annotationsBySectionIndex[h].push(o):this._annotationsBySectionIndex[h]=[o],this.rendition.views().forEach(t=>{l.sectionIndex===t.index&&l.attach(t)}),l}remove(t,e){let i=encodeURI(t+e);if(i in this._annotations){let t=this._annotations[i];if(e&&t.type!==e)return;this.rendition.views().forEach(e=>{this._removeFromAnnotationBySectionIndex(t.sectionIndex,i),t.sectionIndex===e.index&&t.detach(e)}),delete this._annotations[i]}}_removeFromAnnotationBySectionIndex(t,e){this._annotationsBySectionIndex[t]=this._annotationsAt(t).filter(t=>t!==e)}_annotationsAt(t){return this._annotationsBySectionIndex[t]}highlight(t,e,i,n,r){return this.add("highlight",t,e,i,n,r)}underline(t,e,i,n,r){return this.add("underline",t,e,i,n,r)}mark(t,e,i){return this.add("mark",t,e,i)}each(){return this._annotations.forEach.apply(this._annotations,arguments)}inject(t){let e=t.index;if(e in this._annotationsBySectionIndex){this._annotationsBySectionIndex[e].forEach(e=>{this._annotations[e].attach(t)})}}clear(t){let e=t.index;if(e in this._annotationsBySectionIndex){this._annotationsBySectionIndex[e].forEach(e=>{this._annotations[e].detach(t)})}}show(){}hide(){}},v=i(54),m=i(22),y=i(56);class b{constructor(t,e){this.settings=Object(s.extend)(this.settings||{},{width:null,height:null,ignoreClass:"",manager:"default",view:"iframe",flow:null,layout:null,spread:null,minSpreadWidth:800,stylesheet:null,resizeOnOrientationChange:!0,script:null,snap:!1,defaultDirection:"ltr"}),Object(s.extend)(this.settings,e),"object"==typeof this.settings.manager&&(this.manager=this.settings.manager),this.book=t,this.hooks={},this.hooks.display=new o.a(this),this.hooks.serialize=new o.a(this),this.hooks.content=new o.a(this),this.hooks.unloaded=new o.a(this),this.hooks.layout=new o.a(this),this.hooks.render=new o.a(this),this.hooks.show=new o.a(this),this.hooks.content.register(this.handleLinks.bind(this)),this.hooks.content.register(this.passEvents.bind(this)),this.hooks.content.register(this.adjustImages.bind(this)),this.book.spine.hooks.content.register(this.injectIdentifier.bind(this)),this.settings.stylesheet&&this.book.spine.hooks.content.register(this.injectStylesheet.bind(this)),this.settings.script&&this.book.spine.hooks.content.register(this.injectScript.bind(this)),this.themes=new f(this),this.annotations=new g(this),this.epubcfi=new a.a,this.q=new h.a(this),this.location=void 0,this.q.enqueue(this.book.opened),this.starting=new s.defer,this.started=this.starting.promise,this.q.enqueue(this.start)}setManager(t){this.manager=t}requireManager(t){return"string"==typeof t&&"default"===t?m.a:"string"==typeof t&&"continuous"===t?y.a:t}requireView(t){return"string"==typeof t&&"iframe"===t?v.a:t}start(){switch(this.settings.layout||"pre-paginated"!==this.book.package.metadata.layout&&"true"!==this.book.displayOptions.fixedLayout||(this.settings.layout="pre-paginated"),this.book.package.metadata.spread){case"none":this.settings.spread="none";break;case"both":this.settings.spread=!0}this.manager||(this.ViewManager=this.requireManager(this.settings.manager),this.View=this.requireView(this.settings.view),this.manager=new this.ViewManager({view:this.View,queue:this.q,request:this.book.load.bind(this.book),settings:this.settings})),this.direction(this.book.package.metadata.direction||this.settings.defaultDirection),this.settings.globalLayoutProperties=this.determineLayoutProperties(this.book.package.metadata),this.flow(this.settings.globalLayoutProperties.flow),this.layout(this.settings.globalLayoutProperties),this.manager.on(l.c.MANAGERS.ADDED,this.afterDisplayed.bind(this)),this.manager.on(l.c.MANAGERS.REMOVED,this.afterRemoved.bind(this)),this.manager.on(l.c.MANAGERS.RESIZED,this.onResized.bind(this)),this.manager.on(l.c.MANAGERS.ORIENTATION_CHANGE,this.onOrientationChange.bind(this)),this.manager.on(l.c.MANAGERS.SCROLLED,this.reportLocation.bind(this)),this.emit(l.c.RENDITION.STARTED),this.starting.resolve()}attachTo(t){return this.q.enqueue(function(){this.manager.render(t,{width:this.settings.width,height:this.settings.height}),this.emit(l.c.RENDITION.ATTACHED)}.bind(this))}display(t){return this.displaying&&this.displaying.resolve(),this.q.enqueue(this._display,t)}_display(t){if(this.book){this.epubcfi.isCfiString(t);var e,i=new s.defer,n=i.promise;return this.displaying=i,this.book.locations.length()&&Object(s.isFloat)(t)&&(t=this.book.locations.cfiFromPercentage(parseFloat(t))),(e=this.book.spine.get(t))?(this.manager.display(e,t).then(()=>{i.resolve(e),this.displaying=void 0,this.emit(l.c.RENDITION.DISPLAYED,e),this.reportLocation()},t=>{this.emit(l.c.RENDITION.DISPLAY_ERROR,t)}),n):(i.reject(new Error("No Section Found")),n)}}afterDisplayed(t){t.on(l.c.VIEWS.MARK_CLICKED,(e,i)=>this.triggerMarkEvent(e,i,t.contents)),this.hooks.render.trigger(t,this).then(()=>{t.contents?this.hooks.content.trigger(t.contents,this).then(()=>{this.emit(l.c.RENDITION.RENDERED,t.section,t)}):this.emit(l.c.RENDITION.RENDERED,t.section,t)})}afterRemoved(t){this.hooks.unloaded.trigger(t,this).then(()=>{this.emit(l.c.RENDITION.REMOVED,t.section,t)})}onResized(t,e){this.emit(l.c.RENDITION.RESIZED,{width:t.width,height:t.height},e),this.location&&this.location.start&&this.display(e||this.location.start.cfi)}onOrientationChange(t){this.emit(l.c.RENDITION.ORIENTATION_CHANGE,t)}moveTo(t){this.manager.moveTo(t)}resize(t,e,i){t&&(this.settings.width=t),e&&(this.settings.height=e),this.manager.resize(t,e,i)}clear(){this.manager.clear()}next(){return this.q.enqueue(this.manager.next.bind(this.manager)).then(this.reportLocation.bind(this))}prev(){return this.q.enqueue(this.manager.prev.bind(this.manager)).then(this.reportLocation.bind(this))}determineLayoutProperties(t){var e=this.settings.layout||t.layout||"reflowable",i=this.settings.spread||t.spread||"auto",n=this.settings.orientation||t.orientation||"auto",r=this.settings.flow||t.flow||"auto",s=t.viewport||"",o=this.settings.minSpreadWidth||t.minSpreadWidth||800,a=this.settings.direction||t.direction||"ltr";return(0===this.settings.width||this.settings.width>0)&&(0===this.settings.height||this.settings.height),{layout:e,spread:i,orientation:n,flow:r,viewport:s,minSpreadWidth:o,direction:a}}flow(t){var e=t;"scrolled"!==t&&"scrolled-doc"!==t&&"scrolled-continuous"!==t||(e="scrolled"),"auto"!==t&&"paginated"!==t||(e="paginated"),this.settings.flow=t,this._layout&&this._layout.flow(e),this.manager&&this._layout&&this.manager.applyLayout(this._layout),this.manager&&this.manager.updateFlow(e),this.manager&&this.manager.isRendered()&&this.location&&(this.manager.clear(),this.display(this.location.start.cfi))}layout(t){return t&&(this._layout=new u(t),this._layout.spread(t.spread,this.settings.minSpreadWidth),this._layout.on(l.c.LAYOUT.UPDATED,(t,e)=>{this.emit(l.c.RENDITION.LAYOUT,t,e)})),this.manager&&this._layout&&this.manager.applyLayout(this._layout),this._layout}spread(t,e){this.settings.spread=t,e&&(this.settings.minSpreadWidth=e),this._layout&&this._layout.spread(t,e),this.manager&&this.manager.isRendered()&&this.manager.updateLayout()}direction(t){this.settings.direction=t||"ltr",this.manager&&this.manager.direction(this.settings.direction),this.manager&&this.manager.isRendered()&&this.location&&(this.manager.clear(),this.display(this.location.start.cfi))}reportLocation(){return this.q.enqueue(function(){requestAnimationFrame(function(){var t=this.manager.currentLocation();if(t&&t.then&&"function"==typeof t.then)t.then(function(t){let e=this.located(t);e&&e.start&&e.end&&(this.location=e,this.emit(l.c.RENDITION.LOCATION_CHANGED,{index:this.location.start.index,href:this.location.start.href,start:this.location.start.cfi,end:this.location.end.cfi,percentage:this.location.start.percentage}),this.emit(l.c.RENDITION.RELOCATED,this.location))}.bind(this));else if(t){let e=this.located(t);if(!e||!e.start||!e.end)return;this.location=e,this.emit(l.c.RENDITION.LOCATION_CHANGED,{index:this.location.start.index,href:this.location.start.href,start:this.location.start.cfi,end:this.location.end.cfi,percentage:this.location.start.percentage}),this.emit(l.c.RENDITION.RELOCATED,this.location)}}.bind(this))}.bind(this))}currentLocation(){var t=this.manager.currentLocation();if(t&&t.then&&"function"==typeof t.then)t.then(function(t){return this.located(t)}.bind(this));else if(t){return this.located(t)}}located(t){if(!t.length)return{};let e=t[0],i=t[t.length-1],n={start:{index:e.index,href:e.href,cfi:e.mapping.start,displayed:{page:e.pages[0]||1,total:e.totalPages}},end:{index:i.index,href:i.href,cfi:i.mapping.end,displayed:{page:i.pages[i.pages.length-1]||1,total:i.totalPages}}},r=this.book.locations.locationFromCfi(e.mapping.start),s=this.book.locations.locationFromCfi(i.mapping.end);null!=r&&(n.start.location=r,n.start.percentage=this.book.locations.percentageFromLocation(r)),null!=s&&(n.end.location=s,n.end.percentage=this.book.locations.percentageFromLocation(s));let o=this.book.pageList.pageFromCfi(e.mapping.start),a=this.book.pageList.pageFromCfi(i.mapping.end);return-1!=o&&(n.start.page=o),-1!=a&&(n.end.page=a),i.index===this.book.spine.last().index&&n.end.displayed.page>=n.end.displayed.total&&(n.atEnd=!0),e.index===this.book.spine.first().index&&1===n.start.displayed.page&&(n.atStart=!0),n}destroy(){this.manager&&this.manager.destroy(),this.book=void 0}passEvents(t){l.a.forEach(e=>{t.on(e,e=>this.triggerViewEvent(e,t))}),t.on(l.c.CONTENTS.SELECTED,e=>this.triggerSelectedEvent(e,t))}triggerViewEvent(t,e){this.emit(t.type,t,e)}triggerSelectedEvent(t,e){this.emit(l.c.RENDITION.SELECTED,t,e)}triggerMarkEvent(t,e,i){this.emit(l.c.RENDITION.MARK_CLICKED,t,e,i)}getRange(t,e){var i=new a.a(t),n=this.manager.visible().filter((function(t){if(i.spinePos===t.index)return!0}));if(n.length)return n[0].contents.range(i,e)}adjustImages(t){if("pre-paginated"===this._layout.name)return new Promise((function(t){t()}));let e=t.window.getComputedStyle(t.content,null),i=.95*(t.content.offsetHeight-(parseFloat(e.paddingTop)+parseFloat(e.paddingBottom))),n=parseFloat(e.paddingLeft)+parseFloat(e.paddingRight);return t.addStylesheetRules({img:{"max-width":(this._layout.columnWidth?this._layout.columnWidth-n+"px":"100%")+"!important","max-height":i+"px!important","object-fit":"contain","page-break-inside":"avoid","break-inside":"avoid","box-sizing":"border-box"},svg:{"max-width":(this._layout.columnWidth?this._layout.columnWidth-n+"px":"100%")+"!important","max-height":i+"px!important","page-break-inside":"avoid","break-inside":"avoid"}}),new Promise((function(t,e){setTimeout((function(){t()}),1)}))}getContents(){return this.manager?this.manager.getContents():[]}views(){return(this.manager?this.manager.views:void 0)||[]}handleLinks(t){t&&t.on(l.c.CONTENTS.LINK_CLICKED,t=>{let e=this.book.path.relative(t);this.display(e)})}injectStylesheet(t,e){let i=t.createElement("link");i.setAttribute("type","text/css"),i.setAttribute("rel","stylesheet"),i.setAttribute("href",this.settings.stylesheet),t.getElementsByTagName("head")[0].appendChild(i)}injectScript(t,e){let i=t.createElement("script");i.setAttribute("type","text/javascript"),i.setAttribute("src",this.settings.script),i.textContent=" ",t.getElementsByTagName("head")[0].appendChild(i)}injectIdentifier(t,e){let i=this.book.packaging.metadata.identifier,n=t.createElement("meta");n.setAttribute("name","dc.relation.ispartof"),i&&n.setAttribute("content",i),t.getElementsByTagName("head")[0].appendChild(n)}}r()(b.prototype);e.a=b},function(t,e){var i={}.toString;t.exports=function(t){return i.call(t).slice(8,-1)}},function(t,e,i){var n=i(17);t.exports=function(t,e){if(!n(t))return t;var i,r;if(e&&"function"==typeof(i=t.toString)&&!n(r=i.call(t)))return r;if("function"==typeof(i=t.valueOf)&&!n(r=i.call(t)))return r;if(!e&&"function"==typeof(i=t.toString)&&!n(r=i.call(t)))return r;throw TypeError("Can't convert object to primitive value")}},function(t,e,i){var n=i(7),r=i(15);t.exports=function(t,e){try{r(n,t,e)}catch(i){n[t]=e}return e}},function(t,e,i){var n=i(66),r=i(67),s=n("keys");t.exports=function(t){return s[t]||(s[t]=r(t))}},function(t,e){t.exports={}},function(t,e,i){var n=i(92),r=i(7),s=function(t){return"function"==typeof t?t:void 0};t.exports=function(t,e){return arguments.length<2?s(n[t])||s(r[t]):n[t]&&n[t][e]||r[t]&&r[t][e]}},function(t,e,i){var n=i(35),r=Math.min;t.exports=function(t){return t>0?r(n(t),9007199254740991):0}},function(t,e){t.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},function(t,e,i){"use strict";var n,r,s=i(97),o=i(98),a=RegExp.prototype.exec,h=String.prototype.replace,l=a,c=(n=/a/,r=/b*/g,a.call(n,"a"),a.call(r,"a"),0!==n.lastIndex||0!==r.lastIndex),u=o.UNSUPPORTED_Y||o.BROKEN_CARET,d=void 0!==/()??/.exec("")[1];(c||d||u)&&(l=function(t){var e,i,n,r,o=this,l=u&&o.sticky,f=s.call(o),p=o.source,g=0,v=t;return l&&(-1===(f=f.replace("y","")).indexOf("g")&&(f+="g"),v=String(t).slice(o.lastIndex),o.lastIndex>0&&(!o.multiline||o.multiline&&"\n"!==t[o.lastIndex-1])&&(p="(?: "+p+")",v=" "+v,g++),i=new RegExp("^(?:"+p+")",f)),d&&(i=new RegExp("^"+p+"$(?!\\s)",f)),c&&(e=o.lastIndex),n=a.call(l?i:o,v),l?n?(n.input=n.input.slice(g),n[0]=n[0].slice(g),n.index=o.lastIndex,o.lastIndex+=n[0].length):o.lastIndex=0:c&&n&&(o.lastIndex=o.global?n.index+n[0].length:e),d&&n&&n.length>1&&h.call(n[0],i,(function(){for(r=1;r<arguments.length-2;r++)void 0===arguments[r]&&(n[r]=void 0)})),n}),t.exports=l},function(t,e,i){var n=i(35),r=i(33),s=function(t){return function(e,i){var s,o,a=String(r(e)),h=n(i),l=a.length;return h<0||h>=l?t?"":void 0:(s=a.charCodeAt(h))<55296||s>56319||h+1===l||(o=a.charCodeAt(h+1))<56320||o>57343?t?a.charAt(h):s:t?a.slice(h,h+2):o-56320+(s-55296<<10)+65536}};t.exports={codeAt:s(!1),charAt:s(!0)}},function(t,e,i){var n,r=i(13),s=i(72),o=i(47),a=i(44),h=i(104),l=i(63),c=i(43),u=c("IE_PROTO"),d=function(){},f=function(t){return"<script>"+t+"<\/script>"},p=function(){try{n=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;p=n?function(t){t.write(f("")),t.close();var e=t.parentWindow.Object;return t=null,e}(n):((e=l("iframe")).style.display="none",h.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(f("document.F=Object")),t.close(),t.F);for(var i=o.length;i--;)delete p.prototype[o[i]];return p()};a[u]=!0,t.exports=Object.create||function(t,e){var i;return null!==t?(d.prototype=r(t),i=new d,d.prototype=null,i[u]=t):i=p(),void 0===e?i:s(i,e)}},function(t,e,i){"use strict";var n=i(115)();t.exports=function(t){return t!==n&&null!==t}},function(t,e,i){var n=i(81),r=i(27),s=i(8)("iterator");t.exports=function(t){if(null!=t)return t[s]||t["@@iterator"]||r[n(t)]}},function(t,e){t.exports=function(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}},function(t,e,i){"use strict";var n=i(3),r=i.n(n),s=i(0),o=i(2),a=i(28),h=i(1),l=i(29);class c{constructor(t,e){this.settings=Object(s.extend)({ignoreClass:"",axis:void 0,direction:void 0,width:0,height:0,layout:void 0,globalLayoutProperties:{},method:void 0,forceRight:!1},e||{}),this.id="epubjs-view-"+Object(s.uuid)(),this.section=t,this.index=t.index,this.element=this.container(this.settings.axis),this.added=!1,this.displayed=!1,this.rendered=!1,this.fixedWidth=0,this.fixedHeight=0,this.epubcfi=new o.a,this.layout=this.settings.layout,this.pane=void 0,this.highlights={},this.underlines={},this.marks={}}container(t){var e=document.createElement("div");return e.classList.add("epub-view"),e.style.height="0px",e.style.width="0px",e.style.overflow="hidden",e.style.position="relative",e.style.display="block",e.style.flex=t&&"horizontal"==t?"none":"initial",e}create(){return this.iframe||(this.element||(this.element=this.createContainer()),this.iframe=document.createElement("iframe"),this.iframe.id=this.id,this.iframe.scrolling="no",this.iframe.style.overflow="hidden",this.iframe.seamless="seamless",this.iframe.style.border="none",this.iframe.setAttribute("enable-annotation","true"),this.resizing=!0,this.element.style.visibility="hidden",this.iframe.style.visibility="hidden",this.iframe.style.width="0",this.iframe.style.height="0",this._width=0,this._height=0,this.element.setAttribute("ref",this.index),this.added=!0,this.elementBounds=Object(s.bounds)(this.element),"srcdoc"in this.iframe?this.supportsSrcdoc=!0:this.supportsSrcdoc=!1,this.settings.method||(this.settings.method=this.supportsSrcdoc?"srcdoc":"write")),this.iframe}render(t,e){return this.create(),this.size(),this.sectionRender||(this.sectionRender=this.section.render(t)),this.sectionRender.then(function(t){return this.load(t)}.bind(this)).then(function(){let t,e=this.contents.writingMode();return t="scrolled"===this.settings.flow?0===e.indexOf("vertical")?"horizontal":"vertical":0===e.indexOf("vertical")?"vertical":"horizontal",0===e.indexOf("vertical")&&"paginated"===this.settings.flow&&(this.layout.delta=this.layout.height),this.setAxis(t),this.emit(h.c.VIEWS.AXIS,t),this.setWritingMode(e),this.emit(h.c.VIEWS.WRITING_MODE,e),this.layout.format(this.contents,this.section,this.axis),this.addListeners(),new Promise((t,e)=>{this.expand(),this.settings.forceRight&&(this.element.style.marginLeft=this.width()+"px"),t()})}.bind(this),function(t){return this.emit(h.c.VIEWS.LOAD_ERROR,t),new Promise((e,i)=>{i(t)})}.bind(this)).then(function(){this.emit(h.c.VIEWS.RENDERED,this.section)}.bind(this))}reset(){this.iframe&&(this.iframe.style.width="0",this.iframe.style.height="0",this._width=0,this._height=0,this._textWidth=void 0,this._contentWidth=void 0,this._textHeight=void 0,this._contentHeight=void 0),this._needsReframe=!0}size(t,e){var i=t||this.settings.width,n=e||this.settings.height;"pre-paginated"===this.layout.name?this.lock("both",i,n):"horizontal"===this.settings.axis?this.lock("height",i,n):this.lock("width",i,n),this.settings.width=i,this.settings.height=n}lock(t,e,i){var n,r=Object(s.borders)(this.element);n=this.iframe?Object(s.borders)(this.iframe):{width:0,height:0},"width"==t&&Object(s.isNumber)(e)&&(this.lockedWidth=e-r.width-n.width),"height"==t&&Object(s.isNumber)(i)&&(this.lockedHeight=i-r.height-n.height),"both"===t&&Object(s.isNumber)(e)&&Object(s.isNumber)(i)&&(this.lockedWidth=e-r.width-n.width,this.lockedHeight=i-r.height-n.height),this.displayed&&this.iframe&&this.expand()}expand(t){var e,i=this.lockedWidth,n=this.lockedHeight;this.iframe&&!this._expanding&&(this._expanding=!0,"pre-paginated"===this.layout.name?(i=this.layout.columnWidth,n=this.layout.height):"horizontal"===this.settings.axis?((i=this.contents.textWidth())%this.layout.pageWidth>0&&(i=Math.ceil(i/this.layout.pageWidth)*this.layout.pageWidth),this.settings.forceEvenPages&&(e=i/this.layout.pageWidth,this.layout.divisor>1&&"reflowable"===this.layout.name&&e%2>0&&(i+=this.layout.pageWidth))):"vertical"===this.settings.axis&&(n=this.contents.textHeight(),"paginated"===this.settings.flow&&n%this.layout.height>0&&(n=Math.ceil(n/this.layout.height)*this.layout.height)),(this._needsReframe||i!=this._width||n!=this._height)&&this.reframe(i,n),this._expanding=!1)}reframe(t,e){var i;Object(s.isNumber)(t)&&(this.element.style.width=t+"px",this.iframe.style.width=t+"px",this._width=t),Object(s.isNumber)(e)&&(this.element.style.height=e+"px",this.iframe.style.height=e+"px",this._height=e),i={width:t,height:e,widthDelta:this.prevBounds?t-this.prevBounds.width:t,heightDelta:this.prevBounds?e-this.prevBounds.height:e},this.pane&&this.pane.render(),requestAnimationFrame(()=>{let t;for(let e in this.marks)this.marks.hasOwnProperty(e)&&(t=this.marks[e],this.placeMark(t.element,t.range))}),this.onResize(this,i),this.emit(h.c.VIEWS.RESIZED,i),this.prevBounds=i,this.elementBounds=Object(s.bounds)(this.element)}load(t){var e=new s.defer,i=e.promise;if(!this.iframe)return e.reject(new Error("No Iframe Available")),i;if(this.iframe.onload=function(t){this.onLoad(t,e)}.bind(this),"blobUrl"===this.settings.method)this.blobUrl=Object(s.createBlobUrl)(t,"application/xhtml+xml"),this.iframe.src=this.blobUrl,this.element.appendChild(this.iframe);else if("srcdoc"===this.settings.method)this.iframe.srcdoc=t,this.element.appendChild(this.iframe);else{if(this.element.appendChild(this.iframe),this.document=this.iframe.contentDocument,!this.document)return e.reject(new Error("No Document Available")),i;if(this.iframe.contentDocument.open(),window.MSApp&&MSApp.execUnsafeLocalFunction){var n=this;MSApp.execUnsafeLocalFunction((function(){n.iframe.contentDocument.write(t)}))}else this.iframe.contentDocument.write(t);this.iframe.contentDocument.close()}return i}onLoad(t,e){this.window=this.iframe.contentWindow,this.document=this.iframe.contentDocument,this.contents=new a.a(this.document,this.document.body,this.section.cfiBase,this.section.index),this.rendering=!1;var i=this.document.querySelector("link[rel='canonical']");i?i.setAttribute("href",this.section.canonical):((i=this.document.createElement("link")).setAttribute("rel","canonical"),i.setAttribute("href",this.section.canonical),this.document.querySelector("head").appendChild(i)),this.contents.on(h.c.CONTENTS.EXPAND,()=>{this.displayed&&this.iframe&&(this.expand(),this.contents&&this.layout.format(this.contents))}),this.contents.on(h.c.CONTENTS.RESIZE,t=>{this.displayed&&this.iframe&&(this.expand(),this.contents&&this.layout.format(this.contents))}),e.resolve(this.contents)}setLayout(t){this.layout=t,this.contents&&(this.layout.format(this.contents),this.expand())}setAxis(t){this.settings.axis=t,this.element.style.flex="horizontal"==t?"none":"initial",this.size()}setWritingMode(t){this.writingMode=t}addListeners(){}removeListeners(t){}display(t){var e=new s.defer;return this.displayed?e.resolve(this):this.render(t).then(function(){this.emit(h.c.VIEWS.DISPLAYED,this),this.onDisplayed(this),this.displayed=!0,e.resolve(this)}.bind(this),(function(t){e.reject(t,this)})),e.promise}show(){this.element.style.visibility="visible",this.iframe&&(this.iframe.style.visibility="visible",this.iframe.style.transform="translateZ(0)",this.iframe.offsetWidth,this.iframe.style.transform=null),this.emit(h.c.VIEWS.SHOWN,this)}hide(){this.element.style.visibility="hidden",this.iframe.style.visibility="hidden",this.stopExpanding=!0,this.emit(h.c.VIEWS.HIDDEN,this)}offset(){return{top:this.element.offsetTop,left:this.element.offsetLeft}}width(){return this._width}height(){return this._height}position(){return this.element.getBoundingClientRect()}locationOf(t){this.iframe.getBoundingClientRect();var e=this.contents.locationOf(t,this.settings.ignoreClass);return{left:e.left,top:e.top}}onDisplayed(t){}onResize(t,e){}bounds(t){return!t&&this.elementBounds||(this.elementBounds=Object(s.bounds)(this.element)),this.elementBounds}highlight(t,e={},i,n="epubjs-hl",r={}){if(!this.contents)return;const s=Object.assign({fill:"yellow","fill-opacity":"0.3","mix-blend-mode":"multiply"},r);let o=this.contents.range(t),a=()=>{this.emit(h.c.VIEWS.MARK_CLICKED,t,e)};e.epubcfi=t,this.pane||(this.pane=new l.Pane(this.iframe,this.element));let c=new l.Highlight(o,n,e,s),u=this.pane.addMark(c);return this.highlights[t]={mark:u,element:u.element,listeners:[a,i]},u.element.setAttribute("ref",n),u.element.addEventListener("click",a),u.element.addEventListener("touchstart",a),i&&(u.element.addEventListener("click",i),u.element.addEventListener("touchstart",i)),u}underline(t,e={},i,n="epubjs-ul",r={}){if(!this.contents)return;const s=Object.assign({stroke:"black","stroke-opacity":"0.3","mix-blend-mode":"multiply"},r);let o=this.contents.range(t),a=()=>{this.emit(h.c.VIEWS.MARK_CLICKED,t,e)};e.epubcfi=t,this.pane||(this.pane=new l.Pane(this.iframe,this.element));let c=new l.Underline(o,n,e,s),u=this.pane.addMark(c);return this.underlines[t]={mark:u,element:u.element,listeners:[a,i]},u.element.setAttribute("ref",n),u.element.addEventListener("click",a),u.element.addEventListener("touchstart",a),i&&(u.element.addEventListener("click",i),u.element.addEventListener("touchstart",i)),u}mark(t,e={},i){if(!this.contents)return;if(t in this.marks){return this.marks[t]}let n=this.contents.range(t);if(!n)return;let r=n.commonAncestorContainer,s=1===r.nodeType?r:r.parentNode,o=i=>{this.emit(h.c.VIEWS.MARK_CLICKED,t,e)};n.collapsed&&1===r.nodeType?(n=new Range,n.selectNodeContents(r)):n.collapsed&&(n=new Range,n.selectNodeContents(s));let a=this.document.createElement("a");return a.setAttribute("ref","epubjs-mk"),a.style.position="absolute",a.dataset.epubcfi=t,e&&Object.keys(e).forEach(t=>{a.dataset[t]=e[t]}),i&&(a.addEventListener("click",i),a.addEventListener("touchstart",i)),a.addEventListener("click",o),a.addEventListener("touchstart",o),this.placeMark(a,n),this.element.appendChild(a),this.marks[t]={element:a,range:n,listeners:[o,i]},s}placeMark(t,e){let i,n,r;if("pre-paginated"===this.layout.name||"horizontal"!==this.settings.axis){let t=e.getBoundingClientRect();i=t.top,n=t.right}else{let t,o=e.getClientRects();for(var s=0;s!=o.length;s++)t=o[s],(!r||t.left<r)&&(r=t.left,n=Math.ceil(r/this.layout.props.pageWidth)*this.layout.props.pageWidth-this.layout.gap/2,i=t.top)}t.style.top=i+"px",t.style.left=n+"px"}unhighlight(t){let e;t in this.highlights&&(e=this.highlights[t],this.pane.removeMark(e.mark),e.listeners.forEach(t=>{t&&(e.element.removeEventListener("click",t),e.element.removeEventListener("touchstart",t))}),delete this.highlights[t])}ununderline(t){let e;t in this.underlines&&(e=this.underlines[t],this.pane.removeMark(e.mark),e.listeners.forEach(t=>{t&&(e.element.removeEventListener("click",t),e.element.removeEventListener("touchstart",t))}),delete this.underlines[t])}unmark(t){let e;t in this.marks&&(e=this.marks[t],this.element.removeChild(e.element),e.listeners.forEach(t=>{t&&(e.element.removeEventListener("click",t),e.element.removeEventListener("touchstart",t))}),delete this.marks[t])}destroy(){for(let t in this.highlights)this.unhighlight(t);for(let t in this.underlines)this.ununderline(t);for(let t in this.marks)this.unmark(t);this.blobUrl&&Object(s.revokeBlobUrl)(this.blobUrl),this.displayed&&(this.displayed=!1,this.removeListeners(),this.contents.destroy(),this.stopExpanding=!0,this.element.removeChild(this.iframe),this.iframe=void 0,this.contents=void 0,this._textWidth=null,this._textHeight=null,this._width=null,this._height=null)}}r()(c.prototype),e.a=c},function(t,e,i){var n=i(53),r=i(137),s=i(139),o=Math.max,a=Math.min;t.exports=function(t,e,i){var h,l,c,u,d,f,p=0,g=!1,v=!1,m=!0;if("function"!=typeof t)throw new TypeError("Expected a function");function y(e){var i=h,n=l;return h=l=void 0,p=e,u=t.apply(n,i)}function b(t){return p=t,d=setTimeout(x,e),g?y(t):u}function w(t){var i=t-f;return void 0===f||i>=e||i<0||v&&t-p>=c}function x(){var t=r();if(w(t))return E(t);d=setTimeout(x,function(t){var i=e-(t-f);return v?a(i,c-(t-p)):i}(t))}function E(t){return d=void 0,m&&h?y(t):(h=l=void 0,u)}function S(){var t=r(),i=w(t);if(h=arguments,l=this,f=t,i){if(void 0===d)return b(f);if(v)return clearTimeout(d),d=setTimeout(x,e),y(f)}return void 0===d&&(d=setTimeout(x,e)),u}return e=s(e)||0,n(i)&&(g=!!i.leading,c=(v="maxWait"in i)?o(s(i.maxWait)||0,e):c,m="trailing"in i?!!i.trailing:m),S.cancel=function(){void 0!==d&&clearTimeout(d),p=0,h=f=l=d=void 0},S.flush=function(){return void 0===d?u:E(r())},S}},function(t,e,i){"use strict";i(14);var n=i(0),r=i(22),s=i(1),o=i(3),a=i.n(o);const h=Math.PI/2,l={easeOutSine:function(t){return Math.sin(t*h)},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*Math.pow(t,5):.5*(Math.pow(t-2,5)+2)},easeInCubic:function(t){return Math.pow(t,3)}};class c{constructor(t,e){this.settings=Object(n.extend)({duration:80,minVelocity:.2,minDistance:10,easing:l.easeInCubic},e||{}),this.supportsTouch=this.supportsTouch(),this.supportsTouch&&this.setup(t)}setup(t){this.manager=t,this.layout=this.manager.layout,this.fullsize=this.manager.settings.fullsize,this.fullsize?(this.element=this.manager.stage.element,this.scroller=window,this.disableScroll()):(this.element=this.manager.stage.container,this.scroller=this.element,this.element.style.WebkitOverflowScrolling="touch"),this.manager.settings.offset=this.layout.width,this.manager.settings.afterScrolledTimeout=2*this.settings.duration,this.isVertical="vertical"===this.manager.settings.axis,this.manager.isPaginated&&!this.isVertical&&(this.touchCanceler=!1,this.resizeCanceler=!1,this.snapping=!1,this.scrollLeft,this.scrollTop,this.startTouchX=void 0,this.startTouchY=void 0,this.startTime=void 0,this.endTouchX=void 0,this.endTouchY=void 0,this.endTime=void 0,this.addListeners())}supportsTouch(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)}disableScroll(){this.element.style.overflow="hidden"}enableScroll(){this.element.style.overflow=""}addListeners(){this._onResize=this.onResize.bind(this),window.addEventListener("resize",this._onResize),this._onScroll=this.onScroll.bind(this),this.scroller.addEventListener("scroll",this._onScroll),this._onTouchStart=this.onTouchStart.bind(this),this.scroller.addEventListener("touchstart",this._onTouchStart,{passive:!0}),this.on("touchstart",this._onTouchStart),this._onTouchMove=this.onTouchMove.bind(this),this.scroller.addEventListener("touchmove",this._onTouchMove,{passive:!0}),this.on("touchmove",this._onTouchMove),this._onTouchEnd=this.onTouchEnd.bind(this),this.scroller.addEventListener("touchend",this._onTouchEnd,{passive:!0}),this.on("touchend",this._onTouchEnd),this._afterDisplayed=this.afterDisplayed.bind(this),this.manager.on(s.c.MANAGERS.ADDED,this._afterDisplayed)}removeListeners(){window.removeEventListener("resize",this._onResize),this._onResize=void 0,this.scroller.removeEventListener("scroll",this._onScroll),this._onScroll=void 0,this.scroller.removeEventListener("touchstart",this._onTouchStart,{passive:!0}),this.off("touchstart",this._onTouchStart),this._onTouchStart=void 0,this.scroller.removeEventListener("touchmove",this._onTouchMove,{passive:!0}),this.off("touchmove",this._onTouchMove),this._onTouchMove=void 0,this.scroller.removeEventListener("touchend",this._onTouchEnd,{passive:!0}),this.off("touchend",this._onTouchEnd),this._onTouchEnd=void 0,this.manager.off(s.c.MANAGERS.ADDED,this._afterDisplayed),this._afterDisplayed=void 0}afterDisplayed(t){let e=t.contents;["touchstart","touchmove","touchend"].forEach(t=>{e.on(t,t=>this.triggerViewEvent(t,e))})}triggerViewEvent(t,e){this.emit(t.type,t,e)}onScroll(t){this.scrollLeft=this.fullsize?window.scrollX:this.scroller.scrollLeft,this.scrollTop=this.fullsize?window.scrollY:this.scroller.scrollTop}onResize(t){this.resizeCanceler=!0}onTouchStart(t){let{screenX:e,screenY:i}=t.touches[0];this.fullsize&&this.enableScroll(),this.touchCanceler=!0,this.startTouchX||(this.startTouchX=e,this.startTouchY=i,this.startTime=this.now()),this.endTouchX=e,this.endTouchY=i,this.endTime=this.now()}onTouchMove(t){let{screenX:e,screenY:i}=t.touches[0],n=Math.abs(i-this.endTouchY);this.touchCanceler=!0,!this.fullsize&&n<10&&(this.element.scrollLeft-=e-this.endTouchX),this.endTouchX=e,this.endTouchY=i,this.endTime=this.now()}onTouchEnd(t){this.fullsize&&this.disableScroll(),this.touchCanceler=!1;let e=this.wasSwiped();0!==e?this.snap(e):this.snap(),this.startTouchX=void 0,this.startTouchY=void 0,this.startTime=void 0,this.endTouchX=void 0,this.endTouchY=void 0,this.endTime=void 0}wasSwiped(){let t=this.layout.pageWidth*this.layout.divisor,e=this.endTouchX-this.startTouchX,i=Math.abs(e),n=e/(this.endTime-this.startTime),r=this.settings.minVelocity;return i<=this.settings.minDistance||i>=t?0:n>r?-1:n<-r?1:void 0}needsSnap(){return this.scrollLeft%(this.layout.pageWidth*this.layout.divisor)!=0}snap(t=0){let e=this.scrollLeft,i=this.layout.pageWidth*this.layout.divisor,n=Math.round(e/i)*i;return t&&(n+=t*i),this.smoothScrollTo(n)}smoothScrollTo(t){const e=new n.defer,i=this.scrollLeft,r=this.now(),s=this.settings.duration,o=this.settings.easing;return this.snapping=!0,function n(){const a=this.now(),h=Math.min(1,(a-r)/s);if(o(h),this.touchCanceler||this.resizeCanceler)return this.resizeCanceler=!1,this.snapping=!1,void e.resolve();h<1?(window.requestAnimationFrame(n.bind(this)),this.scrollTo(i+(t-i)*h,0)):(this.scrollTo(t,0),this.snapping=!1,e.resolve())}.call(this),e.promise}scrollTo(t=0,e=0){this.fullsize?window.scroll(t,e):(this.scroller.scrollLeft=t,this.scroller.scrollTop=e)}now(){return"now"in window.performance?performance.now():(new Date).getTime()}destroy(){this.scroller&&(this.fullsize&&this.enableScroll(),this.removeListeners(),this.scroller=void 0)}}a()(c.prototype);var u=c,d=i(55),f=i.n(d);class p extends r.a{constructor(t){super(t),this.name="continuous",this.settings=Object(n.extend)(this.settings||{},{infinite:!0,overflow:void 0,axis:void 0,writingMode:void 0,flow:"scrolled",offset:500,offsetDelta:250,width:void 0,height:void 0,snap:!1,afterScrolledTimeout:10}),Object(n.extend)(this.settings,t.settings||{}),"undefined"!=t.settings.gap&&0===t.settings.gap&&(this.settings.gap=t.settings.gap),this.viewSettings={ignoreClass:this.settings.ignoreClass,axis:this.settings.axis,flow:this.settings.flow,layout:this.layout,width:0,height:0,forceEvenPages:!1},this.scrollTop=0,this.scrollLeft=0}display(t,e){return r.a.prototype.display.call(this,t,e).then(function(){return this.fill()}.bind(this))}fill(t){var e=t||new n.defer;return this.q.enqueue(()=>this.check()).then(t=>{t?this.fill(e):e.resolve()}),e.promise}moveTo(t){var e=0,i=0;this.isPaginated?(e=Math.floor(t.left/this.layout.delta)*this.layout.delta,this.settings.offsetDelta):(i=t.top,t.top,this.settings.offsetDelta),(e>0||i>0)&&this.scrollBy(e,i,!0)}afterResized(t){this.emit(s.c.MANAGERS.RESIZE,t.section)}removeShownListeners(t){t.onDisplayed=function(){}}add(t){var e=this.createView(t);return this.views.append(e),e.on(s.c.VIEWS.RESIZED,t=>{e.expanded=!0}),e.on(s.c.VIEWS.AXIS,t=>{this.updateAxis(t)}),e.on(s.c.VIEWS.WRITING_MODE,t=>{this.updateWritingMode(t)}),e.onDisplayed=this.afterDisplayed.bind(this),e.onResize=this.afterResized.bind(this),e.display(this.request)}append(t){var e=this.createView(t);return e.on(s.c.VIEWS.RESIZED,t=>{e.expanded=!0}),e.on(s.c.VIEWS.AXIS,t=>{this.updateAxis(t)}),e.on(s.c.VIEWS.WRITING_MODE,t=>{this.updateWritingMode(t)}),this.views.append(e),e.onDisplayed=this.afterDisplayed.bind(this),e}prepend(t){var e=this.createView(t);return e.on(s.c.VIEWS.RESIZED,t=>{this.counter(t),e.expanded=!0}),e.on(s.c.VIEWS.AXIS,t=>{this.updateAxis(t)}),e.on(s.c.VIEWS.WRITING_MODE,t=>{this.updateWritingMode(t)}),this.views.prepend(e),e.onDisplayed=this.afterDisplayed.bind(this),e}counter(t){"vertical"===this.settings.axis?this.scrollBy(0,t.heightDelta,!0):this.scrollBy(t.widthDelta,0,!0)}update(t){for(var e,i=this.bounds(),r=this.views.all(),s=r.length,o=[],a=void 0!==t?t:this.settings.offset||0,h=new n.defer,l=[],c=0;c<s;c++)if(e=r[c],!0===this.isVisible(e,a,a,i)){if(e.displayed)e.show();else{let t=e.display(this.request).then((function(t){t.show()}),t=>{e.hide()});l.push(t)}o.push(e)}else this.q.enqueue(e.destroy.bind(e)),clearTimeout(this.trimTimeout),this.trimTimeout=setTimeout(function(){this.q.enqueue(this.trim.bind(this))}.bind(this),250);return l.length?Promise.all(l).catch(t=>{h.reject(t)}):(h.resolve(),h.promise)}check(t,e){var i=new n.defer,r=[],s="horizontal"===this.settings.axis,o=this.settings.offset||0;t&&s&&(o=t),e&&!s&&(o=e);var a=this._bounds;let h=s?this.scrollLeft:this.scrollTop,l=s?Math.floor(a.width):a.height,c=s?this.container.scrollWidth:this.container.scrollHeight,u=this.writingMode&&0===this.writingMode.indexOf("vertical")?"vertical":"horizontal",d=this.settings.rtlScrollType,f="rtl"===this.settings.direction;this.settings.fullsize?(s&&f&&"negative"===d||!s&&f&&"default"===d)&&(h*=-1):(f&&"default"===d&&"horizontal"===u&&(h=c-l-h),f&&"negative"===d&&"horizontal"===u&&(h*=-1));let p=()=>{let t=this.views.first(),e=t&&t.section.prev();e&&r.push(this.prepend(e))},g=h-o;h+l+o>=c&&(()=>{let t=this.views.last(),e=t&&t.section.next();e&&r.push(this.append(e))})(),g<0&&p();let v=r.map(t=>t.display(this.request));return r.length?Promise.all(v).then(()=>this.check()).then(()=>this.update(o),t=>t):(this.q.enqueue(function(){this.update()}.bind(this)),i.resolve(!1),i.promise)}trim(){for(var t=new n.defer,e=this.views.displayed(),i=e[0],r=e[e.length-1],s=this.views.indexOf(i),o=this.views.indexOf(r),a=this.views.slice(0,s),h=this.views.slice(o+1),l=0;l<a.length-1;l++)this.erase(a[l],a);for(var c=1;c<h.length;c++)this.erase(h[c]);return t.resolve(),t.promise}erase(t,e){var i,n;this.settings.fullsize?(i=window.scrollY,n=window.scrollX):(i=this.container.scrollTop,n=this.container.scrollLeft);var r=t.bounds();this.views.remove(t),e&&("vertical"===this.settings.axis?this.scrollTo(0,i-r.height,!0):"rtl"===this.settings.direction?this.settings.fullsize?this.scrollTo(n+Math.floor(r.width),0,!0):this.scrollTo(n,0,!0):this.scrollTo(n-Math.floor(r.width),0,!0))}addEventListeners(t){window.addEventListener("unload",function(t){this.ignore=!0,this.destroy()}.bind(this)),this.addScrollListeners(),this.isPaginated&&this.settings.snap&&(this.snapper=new u(this,this.settings.snap&&"object"==typeof this.settings.snap&&this.settings.snap))}addScrollListeners(){var t;this.tick=n.requestAnimationFrame;let e="rtl"===this.settings.direction&&"default"===this.settings.rtlScrollType?-1:1;this.scrollDeltaVert=0,this.scrollDeltaHorz=0,this.settings.fullsize?(t=window,this.scrollTop=window.scrollY*e,this.scrollLeft=window.scrollX*e):(t=this.container,this.scrollTop=this.container.scrollTop,this.scrollLeft=this.container.scrollLeft),this._onScroll=this.onScroll.bind(this),t.addEventListener("scroll",this._onScroll),this._scrolled=f()(this.scrolled.bind(this),30),this.didScroll=!1}removeEventListeners(){(this.settings.fullsize?window:this.container).removeEventListener("scroll",this._onScroll),this._onScroll=void 0}onScroll(){let t,e,i="rtl"===this.settings.direction&&"default"===this.settings.rtlScrollType?-1:1;this.settings.fullsize?(t=window.scrollY*i,e=window.scrollX*i):(t=this.container.scrollTop,e=this.container.scrollLeft),this.scrollTop=t,this.scrollLeft=e,this.ignore?this.ignore=!1:this._scrolled(),this.scrollDeltaVert+=Math.abs(t-this.prevScrollTop),this.scrollDeltaHorz+=Math.abs(e-this.prevScrollLeft),this.prevScrollTop=t,this.prevScrollLeft=e,clearTimeout(this.scrollTimeout),this.scrollTimeout=setTimeout(function(){this.scrollDeltaVert=0,this.scrollDeltaHorz=0}.bind(this),150),clearTimeout(this.afterScrolled),this.didScroll=!1}scrolled(){this.q.enqueue(function(){return this.check()}.bind(this)),this.emit(s.c.MANAGERS.SCROLL,{top:this.scrollTop,left:this.scrollLeft}),clearTimeout(this.afterScrolled),this.afterScrolled=setTimeout(function(){this.snapper&&this.snapper.supportsTouch&&this.snapper.needsSnap()||this.emit(s.c.MANAGERS.SCROLLED,{top:this.scrollTop,left:this.scrollLeft})}.bind(this),this.settings.afterScrolledTimeout)}next(){let t="pre-paginated"===this.layout.props.name&&this.layout.props.spread?2*this.layout.props.delta:this.layout.props.delta;this.views.length&&(this.isPaginated&&"horizontal"===this.settings.axis?this.scrollBy(t,0,!0):this.scrollBy(0,this.layout.height,!0),this.q.enqueue(function(){return this.check()}.bind(this)))}prev(){let t="pre-paginated"===this.layout.props.name&&this.layout.props.spread?2*this.layout.props.delta:this.layout.props.delta;this.views.length&&(this.isPaginated&&"horizontal"===this.settings.axis?this.scrollBy(-t,0,!0):this.scrollBy(0,-this.layout.height,!0),this.q.enqueue(function(){return this.check()}.bind(this)))}updateFlow(t){this.rendered&&this.snapper&&(this.snapper.destroy(),this.snapper=void 0),super.updateFlow(t,"scroll"),this.rendered&&this.isPaginated&&this.settings.snap&&(this.snapper=new u(this,this.settings.snap&&"object"==typeof this.settings.snap&&this.settings.snap))}destroy(){super.destroy(),this.snapper&&this.snapper.destroy()}}e.a=p},function(t,e,i){(function(e){t.exports=function t(e,i,n){function r(o,a){if(!i[o]){if(!e[o]){if(s)return s(o,!0);var h=new Error("Cannot find module '"+o+"'");throw h.code="MODULE_NOT_FOUND",h}var l=i[o]={exports:{}};e[o][0].call(l.exports,(function(t){var i=e[o][1][t];return r(i||t)}),l,l.exports,t,e,i,n)}return i[o].exports}for(var s=!1,o=0;o<n.length;o++)r(n[o]);return r}({1:[function(t,i,n){(function(t){"use strict";var e,n,r=t.MutationObserver||t.WebKitMutationObserver;if(r){var s=0,o=new r(c),a=t.document.createTextNode("");o.observe(a,{characterData:!0}),e=function(){a.data=s=++s%2}}else if(t.setImmediate||void 0===t.MessageChannel)e="document"in t&&"onreadystatechange"in t.document.createElement("script")?function(){var e=t.document.createElement("script");e.onreadystatechange=function(){c(),e.onreadystatechange=null,e.parentNode.removeChild(e),e=null},t.document.documentElement.appendChild(e)}:function(){setTimeout(c,0)};else{var h=new t.MessageChannel;h.port1.onmessage=c,e=function(){h.port2.postMessage(0)}}var l=[];function c(){var t,e;n=!0;for(var i=l.length;i;){for(e=l,l=[],t=-1;++t<i;)e[t]();i=l.length}n=!1}i.exports=function(t){1!==l.push(t)||n||e()}}).call(this,void 0!==e?e:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],2:[function(t,e,i){"use strict";var n=t(1);function r(){}var s={},o=["REJECTED"],a=["FULFILLED"],h=["PENDING"];function l(t){if("function"!=typeof t)throw new TypeError("resolver must be a function");this.state=h,this.queue=[],this.outcome=void 0,t!==r&&f(this,t)}function c(t,e,i){this.promise=t,"function"==typeof e&&(this.onFulfilled=e,this.callFulfilled=this.otherCallFulfilled),"function"==typeof i&&(this.onRejected=i,this.callRejected=this.otherCallRejected)}function u(t,e,i){n((function(){var n;try{n=e(i)}catch(e){return s.reject(t,e)}n===t?s.reject(t,new TypeError("Cannot resolve promise with itself")):s.resolve(t,n)}))}function d(t){var e=t&&t.then;if(t&&("object"==typeof t||"function"==typeof t)&&"function"==typeof e)return function(){e.apply(t,arguments)}}function f(t,e){var i=!1;function n(e){i||(i=!0,s.reject(t,e))}function r(e){i||(i=!0,s.resolve(t,e))}var o=p((function(){e(r,n)}));"error"===o.status&&n(o.value)}function p(t,e){var i={};try{i.value=t(e),i.status="success"}catch(t){i.status="error",i.value=t}return i}e.exports=l,l.prototype.catch=function(t){return this.then(null,t)},l.prototype.then=function(t,e){if("function"!=typeof t&&this.state===a||"function"!=typeof e&&this.state===o)return this;var i=new this.constructor(r);return this.state!==h?u(i,this.state===a?t:e,this.outcome):this.queue.push(new c(i,t,e)),i},c.prototype.callFulfilled=function(t){s.resolve(this.promise,t)},c.prototype.otherCallFulfilled=function(t){u(this.promise,this.onFulfilled,t)},c.prototype.callRejected=function(t){s.reject(this.promise,t)},c.prototype.otherCallRejected=function(t){u(this.promise,this.onRejected,t)},s.resolve=function(t,e){var i=p(d,e);if("error"===i.status)return s.reject(t,i.value);var n=i.value;if(n)f(t,n);else{t.state=a,t.outcome=e;for(var r=-1,o=t.queue.length;++r<o;)t.queue[r].callFulfilled(e)}return t},s.reject=function(t,e){t.state=o,t.outcome=e;for(var i=-1,n=t.queue.length;++i<n;)t.queue[i].callRejected(e);return t},l.resolve=function(t){return t instanceof this?t:s.resolve(new this(r),t)},l.reject=function(t){var e=new this(r);return s.reject(e,t)},l.all=function(t){var e=this;if("[object Array]"!==Object.prototype.toString.call(t))return this.reject(new TypeError("must be an array"));var i=t.length,n=!1;if(!i)return this.resolve([]);for(var o=new Array(i),a=0,h=-1,l=new this(r);++h<i;)c(t[h],h);return l;function c(t,r){e.resolve(t).then((function(t){o[r]=t,++a!==i||n||(n=!0,s.resolve(l,o))}),(function(t){n||(n=!0,s.reject(l,t))}))}},l.race=function(t){var e=this;if("[object Array]"!==Object.prototype.toString.call(t))return this.reject(new TypeError("must be an array"));var i=t.length,n=!1;if(!i)return this.resolve([]);for(var o,a=-1,h=new this(r);++a<i;)o=t[a],e.resolve(o).then((function(t){n||(n=!0,s.resolve(h,t))}),(function(t){n||(n=!0,s.reject(h,t))}));return h}},{1:1}],3:[function(t,i,n){(function(e){"use strict";"function"!=typeof e.Promise&&(e.Promise=t(2))}).call(this,void 0!==e?e:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{2:2}],4:[function(t,e,i){"use strict";var n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},r=function(){try{if("undefined"!=typeof indexedDB)return indexedDB;if("undefined"!=typeof webkitIndexedDB)return webkitIndexedDB;if("undefined"!=typeof mozIndexedDB)return mozIndexedDB;if("undefined"!=typeof OIndexedDB)return OIndexedDB;if("undefined"!=typeof msIndexedDB)return msIndexedDB}catch(t){return}}();function s(t,e){t=t||[],e=e||{};try{return new Blob(t,e)}catch(r){if("TypeError"!==r.name)throw r;for(var i=new("undefined"!=typeof BlobBuilder?BlobBuilder:"undefined"!=typeof MSBlobBuilder?MSBlobBuilder:"undefined"!=typeof MozBlobBuilder?MozBlobBuilder:WebKitBlobBuilder),n=0;n<t.length;n+=1)i.append(t[n]);return i.getBlob(e.type)}}"undefined"==typeof Promise&&t(3);var o=Promise;function a(t,e){e&&t.then((function(t){e(null,t)}),(function(t){e(t)}))}function h(t,e,i){"function"==typeof e&&t.then(e),"function"==typeof i&&t.catch(i)}function l(t){return"string"!=typeof t&&(console.warn(t+" used as a key, but it is not a string."),t=String(t)),t}function c(){if(arguments.length&&"function"==typeof arguments[arguments.length-1])return arguments[arguments.length-1]}var u=void 0,d={},f=Object.prototype.toString;function p(t){return"boolean"==typeof u?o.resolve(u):function(t){return new o((function(e){var i=t.transaction("local-forage-detect-blob-support","readwrite"),n=s([""]);i.objectStore("local-forage-detect-blob-support").put(n,"key"),i.onabort=function(t){t.preventDefault(),t.stopPropagation(),e(!1)},i.oncomplete=function(){var t=navigator.userAgent.match(/Chrome\/(\d+)/),i=navigator.userAgent.match(/Edge\//);e(i||!t||parseInt(t[1],10)>=43)}})).catch((function(){return!1}))}(t).then((function(t){return u=t}))}function g(t){var e=d[t.name],i={};i.promise=new o((function(t,e){i.resolve=t,i.reject=e})),e.deferredOperations.push(i),e.dbReady?e.dbReady=e.dbReady.then((function(){return i.promise})):e.dbReady=i.promise}function v(t){var e=d[t.name].deferredOperations.pop();if(e)return e.resolve(),e.promise}function m(t,e){var i=d[t.name].deferredOperations.pop();if(i)return i.reject(e),i.promise}function y(t,e){return new o((function(i,n){if(d[t.name]=d[t.name]||{forages:[],db:null,dbReady:null,deferredOperations:[]},t.db){if(!e)return i(t.db);g(t),t.db.close()}var s=[t.name];e&&s.push(t.version);var o=r.open.apply(r,s);e&&(o.onupgradeneeded=function(e){var i=o.result;try{i.createObjectStore(t.storeName),e.oldVersion<=1&&i.createObjectStore("local-forage-detect-blob-support")}catch(i){if("ConstraintError"!==i.name)throw i;console.warn('The database "'+t.name+'" has been upgraded from version '+e.oldVersion+" to version "+e.newVersion+', but the storage "'+t.storeName+'" already exists.')}}),o.onerror=function(t){t.preventDefault(),n(o.error)},o.onsuccess=function(){i(o.result),v(t)}}))}function b(t){return y(t,!1)}function w(t){return y(t,!0)}function x(t,e){if(!t.db)return!0;var i=!t.db.objectStoreNames.contains(t.storeName),n=t.version<t.db.version,r=t.version>t.db.version;if(n&&(t.version!==e&&console.warn('The database "'+t.name+"\" can't be downgraded from version "+t.db.version+" to version "+t.version+"."),t.version=t.db.version),r||i){if(i){var s=t.db.version+1;s>t.version&&(t.version=s)}return!0}return!1}function E(t){return s([function(t){for(var e=t.length,i=new ArrayBuffer(e),n=new Uint8Array(i),r=0;r<e;r++)n[r]=t.charCodeAt(r);return i}(atob(t.data))],{type:t.type})}function S(t){return t&&t.__local_forage_encoded_blob}function _(t){var e=this,i=e._initReady().then((function(){var t=d[e._dbInfo.name];if(t&&t.dbReady)return t.dbReady}));return h(i,t,t),i}function O(t,e,i,n){void 0===n&&(n=1);try{var r=t.db.transaction(t.storeName,e);i(null,r)}catch(r){if(n>0&&(!t.db||"InvalidStateError"===r.name||"NotFoundError"===r.name))return o.resolve().then((function(){if(!t.db||"NotFoundError"===r.name&&!t.db.objectStoreNames.contains(t.storeName)&&t.version<=t.db.version)return t.db&&(t.version=t.db.version+1),w(t)})).then((function(){return function(t){g(t);for(var e=d[t.name],i=e.forages,n=0;n<i.length;n++){var r=i[n];r._dbInfo.db&&(r._dbInfo.db.close(),r._dbInfo.db=null)}return t.db=null,b(t).then((function(e){return t.db=e,x(t)?w(t):e})).then((function(n){t.db=e.db=n;for(var r=0;r<i.length;r++)i[r]._dbInfo.db=n})).catch((function(e){throw m(t,e),e}))}(t).then((function(){O(t,e,i,n-1)}))})).catch(i);i(r)}}var C={_driver:"asyncStorage",_initStorage:function(t){var e=this,i={db:null};if(t)for(var n in t)i[n]=t[n];var r=d[i.name];r||(r={forages:[],db:null,dbReady:null,deferredOperations:[]},d[i.name]=r),r.forages.push(e),e._initReady||(e._initReady=e.ready,e.ready=_);var s=[];function a(){return o.resolve()}for(var h=0;h<r.forages.length;h++){var l=r.forages[h];l!==e&&s.push(l._initReady().catch(a))}var c=r.forages.slice(0);return o.all(s).then((function(){return i.db=r.db,b(i)})).then((function(t){return i.db=t,x(i,e._defaultConfig.version)?w(i):t})).then((function(t){i.db=r.db=t,e._dbInfo=i;for(var n=0;n<c.length;n++){var s=c[n];s!==e&&(s._dbInfo.db=i.db,s._dbInfo.version=i.version)}}))},_support:function(){try{if(!r)return!1;var t="undefined"!=typeof openDatabase&&/(Safari|iPhone|iPad|iPod)/.test(navigator.userAgent)&&!/Chrome/.test(navigator.userAgent)&&!/BlackBerry/.test(navigator.platform),e="function"==typeof fetch&&-1!==fetch.toString().indexOf("[native code");return(!t||e)&&"undefined"!=typeof indexedDB&&"undefined"!=typeof IDBKeyRange}catch(t){return!1}}(),iterate:function(t,e){var i=this,n=new o((function(e,n){i.ready().then((function(){O(i._dbInfo,"readonly",(function(r,s){if(r)return n(r);try{var o=s.objectStore(i._dbInfo.storeName).openCursor(),a=1;o.onsuccess=function(){var i=o.result;if(i){var n=i.value;S(n)&&(n=E(n));var r=t(n,i.key,a++);void 0!==r?e(r):i.continue()}else e()},o.onerror=function(){n(o.error)}}catch(t){n(t)}}))})).catch(n)}));return a(n,e),n},getItem:function(t,e){var i=this;t=l(t);var n=new o((function(e,n){i.ready().then((function(){O(i._dbInfo,"readonly",(function(r,s){if(r)return n(r);try{var o=s.objectStore(i._dbInfo.storeName).get(t);o.onsuccess=function(){var t=o.result;void 0===t&&(t=null),S(t)&&(t=E(t)),e(t)},o.onerror=function(){n(o.error)}}catch(t){n(t)}}))})).catch(n)}));return a(n,e),n},setItem:function(t,e,i){var n=this;t=l(t);var r=new o((function(i,r){var s;n.ready().then((function(){return s=n._dbInfo,"[object Blob]"===f.call(e)?p(s.db).then((function(t){return t?e:(i=e,new o((function(t,e){var n=new FileReader;n.onerror=e,n.onloadend=function(e){var n=btoa(e.target.result||"");t({__local_forage_encoded_blob:!0,data:n,type:i.type})},n.readAsBinaryString(i)})));var i})):e})).then((function(e){O(n._dbInfo,"readwrite",(function(s,o){if(s)return r(s);try{var a=o.objectStore(n._dbInfo.storeName);null===e&&(e=void 0);var h=a.put(e,t);o.oncomplete=function(){void 0===e&&(e=null),i(e)},o.onabort=o.onerror=function(){var t=h.error?h.error:h.transaction.error;r(t)}}catch(t){r(t)}}))})).catch(r)}));return a(r,i),r},removeItem:function(t,e){var i=this;t=l(t);var n=new o((function(e,n){i.ready().then((function(){O(i._dbInfo,"readwrite",(function(r,s){if(r)return n(r);try{var o=s.objectStore(i._dbInfo.storeName).delete(t);s.oncomplete=function(){e()},s.onerror=function(){n(o.error)},s.onabort=function(){var t=o.error?o.error:o.transaction.error;n(t)}}catch(t){n(t)}}))})).catch(n)}));return a(n,e),n},clear:function(t){var e=this,i=new o((function(t,i){e.ready().then((function(){O(e._dbInfo,"readwrite",(function(n,r){if(n)return i(n);try{var s=r.objectStore(e._dbInfo.storeName).clear();r.oncomplete=function(){t()},r.onabort=r.onerror=function(){var t=s.error?s.error:s.transaction.error;i(t)}}catch(t){i(t)}}))})).catch(i)}));return a(i,t),i},length:function(t){var e=this,i=new o((function(t,i){e.ready().then((function(){O(e._dbInfo,"readonly",(function(n,r){if(n)return i(n);try{var s=r.objectStore(e._dbInfo.storeName).count();s.onsuccess=function(){t(s.result)},s.onerror=function(){i(s.error)}}catch(t){i(t)}}))})).catch(i)}));return a(i,t),i},key:function(t,e){var i=this,n=new o((function(e,n){t<0?e(null):i.ready().then((function(){O(i._dbInfo,"readonly",(function(r,s){if(r)return n(r);try{var o=s.objectStore(i._dbInfo.storeName),a=!1,h=o.openCursor();h.onsuccess=function(){var i=h.result;i?0===t||a?e(i.key):(a=!0,i.advance(t)):e(null)},h.onerror=function(){n(h.error)}}catch(t){n(t)}}))})).catch(n)}));return a(n,e),n},keys:function(t){var e=this,i=new o((function(t,i){e.ready().then((function(){O(e._dbInfo,"readonly",(function(n,r){if(n)return i(n);try{var s=r.objectStore(e._dbInfo.storeName).openCursor(),o=[];s.onsuccess=function(){var e=s.result;e?(o.push(e.key),e.continue()):t(o)},s.onerror=function(){i(s.error)}}catch(t){i(t)}}))})).catch(i)}));return a(i,t),i},dropInstance:function(t,e){e=c.apply(this,arguments);var i=this.config();(t="function"!=typeof t&&t||{}).name||(t.name=t.name||i.name,t.storeName=t.storeName||i.storeName);var n,s=this;if(t.name){var h=t.name===i.name&&s._dbInfo.db,l=h?o.resolve(s._dbInfo.db):b(t).then((function(e){var i=d[t.name],n=i.forages;i.db=e;for(var r=0;r<n.length;r++)n[r]._dbInfo.db=e;return e}));n=t.storeName?l.then((function(e){if(e.objectStoreNames.contains(t.storeName)){var i=e.version+1;g(t);var n=d[t.name],s=n.forages;e.close();for(var a=0;a<s.length;a++){var h=s[a];h._dbInfo.db=null,h._dbInfo.version=i}return new o((function(e,n){var s=r.open(t.name,i);s.onerror=function(t){s.result.close(),n(t)},s.onupgradeneeded=function(){s.result.deleteObjectStore(t.storeName)},s.onsuccess=function(){var t=s.result;t.close(),e(t)}})).then((function(t){n.db=t;for(var e=0;e<s.length;e++){var i=s[e];i._dbInfo.db=t,v(i._dbInfo)}})).catch((function(e){throw(m(t,e)||o.resolve()).catch((function(){})),e}))}})):l.then((function(e){g(t);var i=d[t.name],n=i.forages;e.close();for(var s=0;s<n.length;s++)n[s]._dbInfo.db=null;return new o((function(e,i){var n=r.deleteDatabase(t.name);n.onerror=n.onblocked=function(t){var e=n.result;e&&e.close(),i(t)},n.onsuccess=function(){var t=n.result;t&&t.close(),e(t)}})).then((function(t){i.db=t;for(var e=0;e<n.length;e++)v(n[e]._dbInfo)})).catch((function(e){throw(m(t,e)||o.resolve()).catch((function(){})),e}))}))}else n=o.reject("Invalid arguments");return a(n,e),n}},T="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",k=/^~~local_forage_type~([^~]+)~/,R="__lfsc__:".length,L=R+"arbf".length,I=Object.prototype.toString;function j(t){var e,i,n,r,s,o=.75*t.length,a=t.length,h=0;"="===t[t.length-1]&&(o--,"="===t[t.length-2]&&o--);var l=new ArrayBuffer(o),c=new Uint8Array(l);for(e=0;e<a;e+=4)i=T.indexOf(t[e]),n=T.indexOf(t[e+1]),r=T.indexOf(t[e+2]),s=T.indexOf(t[e+3]),c[h++]=i<<2|n>>4,c[h++]=(15&n)<<4|r>>2,c[h++]=(3&r)<<6|63&s;return l}function N(t){var e,i=new Uint8Array(t),n="";for(e=0;e<i.length;e+=3)n+=T[i[e]>>2],n+=T[(3&i[e])<<4|i[e+1]>>4],n+=T[(15&i[e+1])<<2|i[e+2]>>6],n+=T[63&i[e+2]];return i.length%3==2?n=n.substring(0,n.length-1)+"=":i.length%3==1&&(n=n.substring(0,n.length-2)+"=="),n}var A={serialize:function(t,e){var i="";if(t&&(i=I.call(t)),t&&("[object ArrayBuffer]"===i||t.buffer&&"[object ArrayBuffer]"===I.call(t.buffer))){var n,r="__lfsc__:";t instanceof ArrayBuffer?(n=t,r+="arbf"):(n=t.buffer,"[object Int8Array]"===i?r+="si08":"[object Uint8Array]"===i?r+="ui08":"[object Uint8ClampedArray]"===i?r+="uic8":"[object Int16Array]"===i?r+="si16":"[object Uint16Array]"===i?r+="ur16":"[object Int32Array]"===i?r+="si32":"[object Uint32Array]"===i?r+="ui32":"[object Float32Array]"===i?r+="fl32":"[object Float64Array]"===i?r+="fl64":e(new Error("Failed to get type for BinaryArray"))),e(r+N(n))}else if("[object Blob]"===i){var s=new FileReader;s.onload=function(){var i="~~local_forage_type~"+t.type+"~"+N(this.result);e("__lfsc__:blob"+i)},s.readAsArrayBuffer(t)}else try{e(JSON.stringify(t))}catch(i){console.error("Couldn't convert value into a JSON string: ",t),e(null,i)}},deserialize:function(t){if("__lfsc__:"!==t.substring(0,R))return JSON.parse(t);var e,i=t.substring(L),n=t.substring(R,L);if("blob"===n&&k.test(i)){var r=i.match(k);e=r[1],i=i.substring(r[0].length)}var o=j(i);switch(n){case"arbf":return o;case"blob":return s([o],{type:e});case"si08":return new Int8Array(o);case"ui08":return new Uint8Array(o);case"uic8":return new Uint8ClampedArray(o);case"si16":return new Int16Array(o);case"ur16":return new Uint16Array(o);case"si32":return new Int32Array(o);case"ui32":return new Uint32Array(o);case"fl32":return new Float32Array(o);case"fl64":return new Float64Array(o);default:throw new Error("Unkown type: "+n)}},stringToBuffer:j,bufferToString:N};function P(t,e,i,n){t.executeSql("CREATE TABLE IF NOT EXISTS "+e.storeName+" (id INTEGER PRIMARY KEY, key unique, value)",[],i,n)}function D(t,e,i,n,r,s){t.executeSql(i,n,r,(function(t,o){o.code===o.SYNTAX_ERR?t.executeSql("SELECT name FROM sqlite_master WHERE type='table' AND name = ?",[e.storeName],(function(t,a){a.rows.length?s(t,o):P(t,e,(function(){t.executeSql(i,n,r,s)}),s)}),s):s(t,o)}),s)}function z(t,e,i,n){var r=this;t=l(t);var s=new o((function(s,o){r.ready().then((function(){void 0===e&&(e=null);var a=e,h=r._dbInfo;h.serializer.serialize(e,(function(e,l){l?o(l):h.db.transaction((function(i){D(i,h,"INSERT OR REPLACE INTO "+h.storeName+" (key, value) VALUES (?, ?)",[t,e],(function(){s(a)}),(function(t,e){o(e)}))}),(function(e){if(e.code===e.QUOTA_ERR){if(n>0)return void s(z.apply(r,[t,a,i,n-1]));o(e)}}))}))})).catch(o)}));return a(s,i),s}function B(t){return new o((function(e,i){t.transaction((function(n){n.executeSql("SELECT name FROM sqlite_master WHERE type='table' AND name <> '__WebKitDatabaseInfoTable__'",[],(function(i,n){for(var r=[],s=0;s<n.rows.length;s++)r.push(n.rows.item(s).name);e({db:t,storeNames:r})}),(function(t,e){i(e)}))}),(function(t){i(t)}))}))}var q={_driver:"webSQLStorage",_initStorage:function(t){var e=this,i={db:null};if(t)for(var n in t)i[n]="string"!=typeof t[n]?t[n].toString():t[n];var r=new o((function(t,n){try{i.db=openDatabase(i.name,String(i.version),i.description,i.size)}catch(t){return n(t)}i.db.transaction((function(r){P(r,i,(function(){e._dbInfo=i,t()}),(function(t,e){n(e)}))}),n)}));return i.serializer=A,r},_support:"function"==typeof openDatabase,iterate:function(t,e){var i=this,n=new o((function(e,n){i.ready().then((function(){var r=i._dbInfo;r.db.transaction((function(i){D(i,r,"SELECT * FROM "+r.storeName,[],(function(i,n){for(var s=n.rows,o=s.length,a=0;a<o;a++){var h=s.item(a),l=h.value;if(l&&(l=r.serializer.deserialize(l)),void 0!==(l=t(l,h.key,a+1)))return void e(l)}e()}),(function(t,e){n(e)}))}))})).catch(n)}));return a(n,e),n},getItem:function(t,e){var i=this;t=l(t);var n=new o((function(e,n){i.ready().then((function(){var r=i._dbInfo;r.db.transaction((function(i){D(i,r,"SELECT * FROM "+r.storeName+" WHERE key = ? LIMIT 1",[t],(function(t,i){var n=i.rows.length?i.rows.item(0).value:null;n&&(n=r.serializer.deserialize(n)),e(n)}),(function(t,e){n(e)}))}))})).catch(n)}));return a(n,e),n},setItem:function(t,e,i){return z.apply(this,[t,e,i,1])},removeItem:function(t,e){var i=this;t=l(t);var n=new o((function(e,n){i.ready().then((function(){var r=i._dbInfo;r.db.transaction((function(i){D(i,r,"DELETE FROM "+r.storeName+" WHERE key = ?",[t],(function(){e()}),(function(t,e){n(e)}))}))})).catch(n)}));return a(n,e),n},clear:function(t){var e=this,i=new o((function(t,i){e.ready().then((function(){var n=e._dbInfo;n.db.transaction((function(e){D(e,n,"DELETE FROM "+n.storeName,[],(function(){t()}),(function(t,e){i(e)}))}))})).catch(i)}));return a(i,t),i},length:function(t){var e=this,i=new o((function(t,i){e.ready().then((function(){var n=e._dbInfo;n.db.transaction((function(e){D(e,n,"SELECT COUNT(key) as c FROM "+n.storeName,[],(function(e,i){var n=i.rows.item(0).c;t(n)}),(function(t,e){i(e)}))}))})).catch(i)}));return a(i,t),i},key:function(t,e){var i=this,n=new o((function(e,n){i.ready().then((function(){var r=i._dbInfo;r.db.transaction((function(i){D(i,r,"SELECT key FROM "+r.storeName+" WHERE id = ? LIMIT 1",[t+1],(function(t,i){var n=i.rows.length?i.rows.item(0).key:null;e(n)}),(function(t,e){n(e)}))}))})).catch(n)}));return a(n,e),n},keys:function(t){var e=this,i=new o((function(t,i){e.ready().then((function(){var n=e._dbInfo;n.db.transaction((function(e){D(e,n,"SELECT key FROM "+n.storeName,[],(function(e,i){for(var n=[],r=0;r<i.rows.length;r++)n.push(i.rows.item(r).key);t(n)}),(function(t,e){i(e)}))}))})).catch(i)}));return a(i,t),i},dropInstance:function(t,e){e=c.apply(this,arguments);var i=this.config();(t="function"!=typeof t&&t||{}).name||(t.name=t.name||i.name,t.storeName=t.storeName||i.storeName);var n,r=this;return a(n=t.name?new o((function(e){var n;n=t.name===i.name?r._dbInfo.db:openDatabase(t.name,"","",0),t.storeName?e({db:n,storeNames:[t.storeName]}):e(B(n))})).then((function(t){return new o((function(e,i){t.db.transaction((function(n){function r(t){return new o((function(e,i){n.executeSql("DROP TABLE IF EXISTS "+t,[],(function(){e()}),(function(t,e){i(e)}))}))}for(var s=[],a=0,h=t.storeNames.length;a<h;a++)s.push(r(t.storeNames[a]));o.all(s).then((function(){e()})).catch((function(t){i(t)}))}),(function(t){i(t)}))}))})):o.reject("Invalid arguments"),e),n}};function M(t,e){var i=t.name+"/";return t.storeName!==e.storeName&&(i+=t.storeName+"/"),i}function U(){return!function(){try{return localStorage.setItem("_localforage_support_test",!0),localStorage.removeItem("_localforage_support_test"),!1}catch(t){return!0}}()||localStorage.length>0}var F={_driver:"localStorageWrapper",_initStorage:function(t){var e={};if(t)for(var i in t)e[i]=t[i];return e.keyPrefix=M(t,this._defaultConfig),U()?(this._dbInfo=e,e.serializer=A,o.resolve()):o.reject()},_support:function(){try{return"undefined"!=typeof localStorage&&"setItem"in localStorage&&!!localStorage.setItem}catch(t){return!1}}(),iterate:function(t,e){var i=this,n=i.ready().then((function(){for(var e=i._dbInfo,n=e.keyPrefix,r=n.length,s=localStorage.length,o=1,a=0;a<s;a++){var h=localStorage.key(a);if(0===h.indexOf(n)){var l=localStorage.getItem(h);if(l&&(l=e.serializer.deserialize(l)),void 0!==(l=t(l,h.substring(r),o++)))return l}}}));return a(n,e),n},getItem:function(t,e){var i=this;t=l(t);var n=i.ready().then((function(){var e=i._dbInfo,n=localStorage.getItem(e.keyPrefix+t);return n&&(n=e.serializer.deserialize(n)),n}));return a(n,e),n},setItem:function(t,e,i){var n=this;t=l(t);var r=n.ready().then((function(){void 0===e&&(e=null);var i=e;return new o((function(r,s){var o=n._dbInfo;o.serializer.serialize(e,(function(e,n){if(n)s(n);else try{localStorage.setItem(o.keyPrefix+t,e),r(i)}catch(t){"QuotaExceededError"!==t.name&&"NS_ERROR_DOM_QUOTA_REACHED"!==t.name||s(t),s(t)}}))}))}));return a(r,i),r},removeItem:function(t,e){var i=this;t=l(t);var n=i.ready().then((function(){var e=i._dbInfo;localStorage.removeItem(e.keyPrefix+t)}));return a(n,e),n},clear:function(t){var e=this,i=e.ready().then((function(){for(var t=e._dbInfo.keyPrefix,i=localStorage.length-1;i>=0;i--){var n=localStorage.key(i);0===n.indexOf(t)&&localStorage.removeItem(n)}}));return a(i,t),i},length:function(t){var e=this.keys().then((function(t){return t.length}));return a(e,t),e},key:function(t,e){var i=this,n=i.ready().then((function(){var e,n=i._dbInfo;try{e=localStorage.key(t)}catch(t){e=null}return e&&(e=e.substring(n.keyPrefix.length)),e}));return a(n,e),n},keys:function(t){var e=this,i=e.ready().then((function(){for(var t=e._dbInfo,i=localStorage.length,n=[],r=0;r<i;r++){var s=localStorage.key(r);0===s.indexOf(t.keyPrefix)&&n.push(s.substring(t.keyPrefix.length))}return n}));return a(i,t),i},dropInstance:function(t,e){if(e=c.apply(this,arguments),!(t="function"!=typeof t&&t||{}).name){var i=this.config();t.name=t.name||i.name,t.storeName=t.storeName||i.storeName}var n,r=this;return a(n=t.name?new o((function(e){t.storeName?e(M(t,r._defaultConfig)):e(t.name+"/")})).then((function(t){for(var e=localStorage.length-1;e>=0;e--){var i=localStorage.key(e);0===i.indexOf(t)&&localStorage.removeItem(i)}})):o.reject("Invalid arguments"),e),n}},W=function(t,e){for(var i,n,r=t.length,s=0;s<r;){if((i=t[s])===(n=e)||"number"==typeof i&&"number"==typeof n&&isNaN(i)&&isNaN(n))return!0;s++}return!1},H=Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)},V={},X={},G={INDEXEDDB:C,WEBSQL:q,LOCALSTORAGE:F},Y=[G.INDEXEDDB._driver,G.WEBSQL._driver,G.LOCALSTORAGE._driver],$=["dropInstance"],K=["clear","getItem","iterate","key","keys","length","removeItem","setItem"].concat($),Z={description:"",driver:Y.slice(),name:"localforage",size:4980736,storeName:"keyvaluepairs",version:1};function J(t,e){t[e]=function(){var i=arguments;return t.ready().then((function(){return t[e].apply(t,i)}))}}function Q(){for(var t=1;t<arguments.length;t++){var e=arguments[t];if(e)for(var i in e)e.hasOwnProperty(i)&&(H(e[i])?arguments[0][i]=e[i].slice():arguments[0][i]=e[i])}return arguments[0]}var tt=new(function(){function t(e){for(var i in function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),G)if(G.hasOwnProperty(i)){var n=G[i],r=n._driver;this[i]=r,V[r]||this.defineDriver(n)}this._defaultConfig=Q({},Z),this._config=Q({},this._defaultConfig,e),this._driverSet=null,this._initDriver=null,this._ready=!1,this._dbInfo=null,this._wrapLibraryMethodsWithReady(),this.setDriver(this._config.driver).catch((function(){}))}return t.prototype.config=function(t){if("object"===(void 0===t?"undefined":n(t))){if(this._ready)return new Error("Can't call config() after localforage has been used.");for(var e in t){if("storeName"===e&&(t[e]=t[e].replace(/\W/g,"_")),"version"===e&&"number"!=typeof t[e])return new Error("Database version must be a number.");this._config[e]=t[e]}return!("driver"in t)||!t.driver||this.setDriver(this._config.driver)}return"string"==typeof t?this._config[t]:this._config},t.prototype.defineDriver=function(t,e,i){var n=new o((function(e,i){try{var n=t._driver,r=new Error("Custom driver not compliant; see https://mozilla.github.io/localForage/#definedriver");if(!t._driver)return void i(r);for(var s=K.concat("_initStorage"),h=0,l=s.length;h<l;h++){var c=s[h];if((!W($,c)||t[c])&&"function"!=typeof t[c])return void i(r)}!function(){for(var e=function(t){return function(){var e=new Error("Method "+t+" is not implemented by the current driver"),i=o.reject(e);return a(i,arguments[arguments.length-1]),i}},i=0,n=$.length;i<n;i++){var r=$[i];t[r]||(t[r]=e(r))}}();var u=function(i){V[n]&&console.info("Redefining LocalForage driver: "+n),V[n]=t,X[n]=i,e()};"_support"in t?t._support&&"function"==typeof t._support?t._support().then(u,i):u(!!t._support):u(!0)}catch(t){i(t)}}));return h(n,e,i),n},t.prototype.driver=function(){return this._driver||null},t.prototype.getDriver=function(t,e,i){var n=V[t]?o.resolve(V[t]):o.reject(new Error("Driver not found."));return h(n,e,i),n},t.prototype.getSerializer=function(t){var e=o.resolve(A);return h(e,t),e},t.prototype.ready=function(t){var e=this,i=e._driverSet.then((function(){return null===e._ready&&(e._ready=e._initDriver()),e._ready}));return h(i,t,t),i},t.prototype.setDriver=function(t,e,i){var n=this;H(t)||(t=[t]);var r=this._getSupportedDrivers(t);function s(){n._config.driver=n.driver()}function a(t){return n._extend(t),s(),n._ready=n._initStorage(n._config),n._ready}var l=null!==this._driverSet?this._driverSet.catch((function(){return o.resolve()})):o.resolve();return this._driverSet=l.then((function(){var t=r[0];return n._dbInfo=null,n._ready=null,n.getDriver(t).then((function(t){n._driver=t._driver,s(),n._wrapLibraryMethodsWithReady(),n._initDriver=function(t){return function(){var e=0;return function i(){for(;e<t.length;){var r=t[e];return e++,n._dbInfo=null,n._ready=null,n.getDriver(r).then(a).catch(i)}s();var h=new Error("No available storage method found.");return n._driverSet=o.reject(h),n._driverSet}()}}(r)}))})).catch((function(){s();var t=new Error("No available storage method found.");return n._driverSet=o.reject(t),n._driverSet})),h(this._driverSet,e,i),this._driverSet},t.prototype.supports=function(t){return!!X[t]},t.prototype._extend=function(t){Q(this,t)},t.prototype._getSupportedDrivers=function(t){for(var e=[],i=0,n=t.length;i<n;i++){var r=t[i];this.supports(r)&&e.push(r)}return e},t.prototype._wrapLibraryMethodsWithReady=function(){for(var t=0,e=K.length;t<e;t++)J(this,K[t])},t.prototype.createInstance=function(e){return new t(e)},t}());e.exports=tt},{3:3}]},{},[4])(4)}).call(this,i(30))},function(t,e,i){"use strict";i(24),i(14);var n=i(3),r=i.n(n),s=i(0),o=i(5),a=i(4),h=i(2),l=i(6),c=i(11);i(20);var u=function(t,e,i,n){var r,o="undefined"!=typeof window&&window.URL,h=o?"blob":"arraybuffer",l=new s.defer,c=new XMLHttpRequest,u=XMLHttpRequest.prototype;for(r in"overrideMimeType"in u||Object.defineProperty(u,"overrideMimeType",{value:function(){}}),i&&(c.withCredentials=!0),c.onreadystatechange=function(){if(this.readyState===XMLHttpRequest.DONE){var t=!1;if(""!==this.responseType&&"document"!==this.responseType||(t=this.responseXML),200===this.status||0===this.status||t){var i;if(!this.response&&!t)return l.reject({status:this.status,message:"Empty Response",stack:(new Error).stack}),l.promise;if(403===this.status)return l.reject({status:this.status,response:this.response,message:"Forbidden",stack:(new Error).stack}),l.promise;i=t?this.responseXML:Object(s.isXml)(e)?Object(s.parse)(this.response,"text/xml"):"xhtml"==e?Object(s.parse)(this.response,"application/xhtml+xml"):"html"==e||"htm"==e?Object(s.parse)(this.response,"text/html"):"json"==e?JSON.parse(this.response):"blob"==e?o?this.response:new Blob([this.response]):this.response,l.resolve(i)}else l.reject({status:this.status,message:this.response,stack:(new Error).stack})}},c.onerror=function(t){l.reject(t)},c.open("GET",t,!0),n)c.setRequestHeader(r,n[r]);return"json"==e&&c.setRequestHeader("Accept","application/json"),e||(e=new a.a(t).extension),"blob"==e&&(c.responseType=h),Object(s.isXml)(e)&&c.overrideMimeType("text/xml"),"binary"==e&&(c.responseType="arraybuffer"),c.send(),l.promise},d=i(38);var f=class{constructor(t,e){this.idref=t.idref,this.linear="yes"===t.linear,this.properties=t.properties,this.index=t.index,this.href=t.href,this.url=t.url,this.canonical=t.canonical,this.next=t.next,this.prev=t.prev,this.cfiBase=t.cfiBase,e?this.hooks=e:(this.hooks={},this.hooks.serialize=new l.a(this),this.hooks.content=new l.a(this)),this.document=void 0,this.contents=void 0,this.output=void 0}load(t){var e=t||this.request||u,i=new s.defer,n=i.promise;return this.contents?i.resolve(this.contents):e(this.url).then(function(t){return this.document=t,this.contents=t.documentElement,this.hooks.content.trigger(this.document,this)}.bind(this)).then(function(){i.resolve(this.contents)}.bind(this)).catch((function(t){i.reject(t)})),n}base(){return Object(c.a)(this.document,this)}render(t){var e=new s.defer,i=e.promise;return this.output,this.load(t).then(function(t){var e=("undefined"!=typeof navigator&&navigator.userAgent||"").indexOf("Trident")>=0,i=new("undefined"==typeof XMLSerializer||e?d.XMLDOMParser:XMLSerializer);return this.output=i.serializeToString(t),this.output}.bind(this)).then(function(){return this.hooks.serialize.trigger(this.output,this)}.bind(this)).then(function(){e.resolve(this.output)}.bind(this)).catch((function(t){e.reject(t)})),i}find(t){var e=this,i=[],n=t.toLowerCase();return Object(s.sprint)(e.document,(function(t){!function(t){for(var r,s,o,a=t.textContent.toLowerCase(),h=e.document.createRange(),l=-1;-1!=s;)-1!=(s=a.indexOf(n,l+1))&&((h=e.document.createRange()).setStart(t,s),h.setEnd(t,s+n.length),r=e.cfiFromRange(h),o=t.textContent.length<150?t.textContent:"..."+(o=t.textContent.substring(s-75,s+75))+"...",i.push({cfi:r,excerpt:o})),l=s}(t)})),i}search(t,e=5){if(void 0===document.createTreeWalker)return this.find(t);let i=[];const n=this,r=t.toLowerCase(),s=function(t){const e=t.reduce((t,e)=>t+e.textContent,"").toLowerCase().indexOf(r);if(-1!=e){const s=0,o=e+r.length;let a=0,h=0;if(e<t[s].length){let r;for(;a<t.length-1&&(h+=t[a].length,!(o<=h));)a+=1;let l=t[s],c=t[a],u=n.document.createRange();u.setStart(l,e);let d=t.slice(0,a).reduce((t,e)=>t+e.textContent.length,0);u.setEnd(c,d>o?o:o-d),r=n.cfiFromRange(u);let f=t.slice(0,a+1).reduce((t,e)=>t+e.textContent,"");f.length>150&&(f=f.substring(e-75,e+75),f="..."+f+"..."),i.push({cfi:r,excerpt:f})}}},o=document.createTreeWalker(n.document,NodeFilter.SHOW_TEXT,null,!1);let a,h=[];for(;a=o.nextNode();)h.push(a),h.length==e&&(s(h.slice(0,e)),h=h.slice(1,e));return h.length>0&&s(h),i}reconcileLayoutSettings(t){var e={layout:t.layout,spread:t.spread,orientation:t.orientation};return this.properties.forEach((function(t){var i,n,r=t.replace("rendition:",""),s=r.indexOf("-");-1!=s&&(i=r.slice(0,s),n=r.slice(s+1),e[i]=n)})),e}cfiFromRange(t){return new h.a(t,this.cfiBase).toString()}cfiFromElement(t){return new h.a(t,this.cfiBase).toString()}unload(){this.document=void 0,this.contents=void 0,this.output=void 0}destroy(){this.unload(),this.hooks.serialize.clear(),this.hooks.content.clear(),this.hooks=void 0,this.idref=void 0,this.linear=void 0,this.properties=void 0,this.index=void 0,this.href=void 0,this.url=void 0,this.next=void 0,this.prev=void 0,this.cfiBase=void 0}};var p=class{constructor(){this.spineItems=[],this.spineByHref={},this.spineById={},this.hooks={},this.hooks.serialize=new l.a,this.hooks.content=new l.a,this.hooks.content.register(c.a),this.hooks.content.register(c.b),this.hooks.content.register(c.d),this.epubcfi=new h.a,this.loaded=!1,this.items=void 0,this.manifest=void 0,this.spineNodeIndex=void 0,this.baseUrl=void 0,this.length=void 0}unpack(t,e,i){this.items=t.spine,this.manifest=t.manifest,this.spineNodeIndex=t.spineNodeIndex,this.baseUrl=t.baseUrl||t.basePath||"",this.length=this.items.length,this.items.forEach((t,n)=>{var r,s=this.manifest[t.idref];t.index=n,t.cfiBase=this.epubcfi.generateChapterComponent(this.spineNodeIndex,t.index,t.idref),t.href&&(t.url=e(t.href,!0),t.canonical=i(t.href)),s&&(t.href=s.href,t.url=e(t.href,!0),t.canonical=i(t.href),s.properties.length&&t.properties.push.apply(t.properties,s.properties)),"yes"===t.linear?(t.prev=function(){let e=t.index;for(;e>0;){let t=this.get(e-1);if(t&&t.linear)return t;e-=1}}.bind(this),t.next=function(){let e=t.index;for(;e<this.spineItems.length-1;){let t=this.get(e+1);if(t&&t.linear)return t;e+=1}}.bind(this)):(t.prev=function(){},t.next=function(){}),r=new f(t,this.hooks),this.append(r)}),this.loaded=!0}get(t){var e=0;if(void 0===t)for(;e<this.spineItems.length;){let t=this.spineItems[e];if(t&&t.linear)break;e+=1}else if(this.epubcfi.isCfiString(t)){e=new h.a(t).spinePos}else"number"==typeof t||!1===isNaN(t)?e=t:"string"==typeof t&&0===t.indexOf("#")?e=this.spineById[t.substring(1)]:"string"==typeof t&&(t=t.split("#")[0],e=this.spineByHref[t]||this.spineByHref[encodeURI(t)]);return this.spineItems[e]||null}append(t){var e=this.spineItems.length;return t.index=e,this.spineItems.push(t),this.spineByHref[decodeURI(t.href)]=e,this.spineByHref[encodeURI(t.href)]=e,this.spineByHref[t.href]=e,this.spineById[t.idref]=e,e}prepend(t){return this.spineByHref[t.href]=0,this.spineById[t.idref]=0,this.spineItems.forEach((function(t,e){t.index=e})),0}remove(t){var e=this.spineItems.indexOf(t);if(e>-1)return delete this.spineByHref[t.href],delete this.spineById[t.idref],this.spineItems.splice(e,1)}each(){return this.spineItems.forEach.apply(this.spineItems,arguments)}first(){let t=0;do{let e=this.get(t);if(e&&e.linear)return e;t+=1}while(t<this.spineItems.length)}last(){let t=this.spineItems.length-1;do{let e=this.get(t);if(e&&e.linear)return e;t-=1}while(t>=0)}destroy(){this.each(t=>t.destroy()),this.spineItems=void 0,this.spineByHref=void 0,this.spineById=void 0,this.hooks.serialize.clear(),this.hooks.content.clear(),this.hooks=void 0,this.epubcfi=void 0,this.loaded=!1,this.items=void 0,this.manifest=void 0,this.spineNodeIndex=void 0,this.baseUrl=void 0,this.length=void 0}},g=i(21),v=i(1);class m{constructor(t,e,i){this.spine=t,this.request=e,this.pause=i||100,this.q=new g.a(this),this.epubcfi=new h.a,this._locations=[],this._locationsWords=[],this.total=0,this.break=150,this._current=0,this._wordCounter=0,this.currentLocation="",this._currentCfi="",this.processingTimeout=void 0}generate(t){return t&&(this.break=t),this.q.pause(),this.spine.each(function(t){t.linear&&this.q.enqueue(this.process.bind(this),t)}.bind(this)),this.q.run().then(function(){return this.total=this._locations.length-1,this._currentCfi&&(this.currentLocation=this._currentCfi),this._locations}.bind(this))}createRange(){return{startContainer:void 0,startOffset:void 0,endContainer:void 0,endOffset:void 0}}process(t){return t.load(this.request).then(function(e){var i=new s.defer,n=this.parse(e,t.cfiBase);return this._locations=this._locations.concat(n),t.unload(),this.processingTimeout=setTimeout(()=>i.resolve(n),this.pause),i.promise}.bind(this))}parse(t,e,i){var n,r,o=[],a=t.ownerDocument,l=Object(s.qs)(a,"body"),c=0,u=i||this.break;if(Object(s.sprint)(l,function(t){var i,s=t.length,a=0;if(0===t.textContent.trim().length)return!1;for(0==c&&((n=this.createRange()).startContainer=t,n.startOffset=0),(i=u-c)>s&&(c+=s,a=s);a<s;)if(i=u-c,0===c&&(a+=1,(n=this.createRange()).startContainer=t,n.startOffset=a),a+i>=s)c+=s-a,a=s;else{a+=i,n.endContainer=t,n.endOffset=a;let r=new h.a(n,e).toString();o.push(r),c=0}r=t}.bind(this)),n&&n.startContainer&&r){n.endContainer=r,n.endOffset=r.length;let t=new h.a(n,e).toString();o.push(t),c=0}return o}generateFromWords(t,e,i){var n=t?new h.a(t):void 0;return this.q.pause(),this._locationsWords=[],this._wordCounter=0,this.spine.each(function(t){t.linear&&(n?t.index>=n.spinePos&&this.q.enqueue(this.processWords.bind(this),t,e,n,i):this.q.enqueue(this.processWords.bind(this),t,e,n,i))}.bind(this)),this.q.run().then(function(){return this._currentCfi&&(this.currentLocation=this._currentCfi),this._locationsWords}.bind(this))}processWords(t,e,i,n){return n&&this._locationsWords.length>=n?Promise.resolve():t.load(this.request).then(function(r){var o=new s.defer,a=this.parseWords(r,t,e,i),h=n-this._locationsWords.length;return this._locationsWords=this._locationsWords.concat(a.length>=n?a.slice(0,h):a),t.unload(),this.processingTimeout=setTimeout(()=>o.resolve(a),this.pause),o.promise}.bind(this))}countWords(t){return(t=(t=(t=t.replace(/(^\s*)|(\s*$)/gi,"")).replace(/[ ]{2,}/gi," ")).replace(/\n /,"\n")).split(" ").length}parseWords(t,e,i,n){var r,o=e.cfiBase,a=[],l=t.ownerDocument,c=Object(s.qs)(l,"body"),u=i,d=!n||n.spinePos!==e.index;n&&e.index===n.spinePos&&(r=n.findNode(n.range?n.path.steps.concat(n.start.steps):n.path.steps,t.ownerDocument));return Object(s.sprint)(c,function(t){if(!d){if(t!==r)return!1;d=!0}if(t.textContent.length<10&&0===t.textContent.trim().length)return!1;var e,i=this.countWords(t.textContent),n=0;if(0===i)return!1;for((e=u-this._wordCounter)>i&&(this._wordCounter+=i,n=i);n<i;)if(n+(e=u-this._wordCounter)>=i)this._wordCounter+=i-n,n=i;else{n+=e;let i=new h.a(t,o);a.push({cfi:i.toString(),wordCount:this._wordCounter}),this._wordCounter=0}t}.bind(this)),a}locationFromCfi(t){let e;return h.a.prototype.isCfiString(t)&&(t=new h.a(t)),0===this._locations.length?-1:(e=Object(s.locationOf)(t,this._locations,this.epubcfi.compare),e>this.total?this.total:e)}percentageFromCfi(t){if(0===this._locations.length)return null;var e=this.locationFromCfi(t);return this.percentageFromLocation(e)}percentageFromLocation(t){return t&&this.total?t/this.total:0}cfiFromLocation(t){var e=-1;return"number"!=typeof t&&(t=parseInt(t)),t>=0&&t<this._locations.length&&(e=this._locations[t]),e}cfiFromPercentage(t){let e;if(t>1&&console.warn("Normalize cfiFromPercentage value to between 0 - 1"),t>=1){let t=new h.a(this._locations[this.total]);return t.collapse(),t.toString()}return e=Math.ceil(this.total*t),this.cfiFromLocation(e)}load(t){return this._locations="string"==typeof t?JSON.parse(t):t,this.total=this._locations.length-1,this._locations}save(){return JSON.stringify(this._locations)}getCurrent(){return this._current}setCurrent(t){var e;if("string"==typeof t)this._currentCfi=t;else{if("number"!=typeof t)return;this._current=t}0!==this._locations.length&&("string"==typeof t?(e=this.locationFromCfi(t),this._current=e):e=t,this.emit(v.c.LOCATIONS.CHANGED,{percentage:this.percentageFromLocation(e)}))}get currentLocation(){return this._current}set currentLocation(t){this.setCurrent(t)}length(){return this._locations.length}destroy(){this.spine=void 0,this.request=void 0,this.pause=void 0,this.q.stop(),this.q=void 0,this.epubcfi=void 0,this._locations=void 0,this.total=void 0,this.break=void 0,this._current=void 0,this.currentLocation=void 0,this._currentCfi=void 0,clearTimeout(this.processingTimeout)}}r()(m.prototype);var y=m,b=i(9),w=i.n(b);var x=class{constructor(t){this.packagePath="",this.directory="",this.encoding="",t&&this.parse(t)}parse(t){var e;if(!t)throw new Error("Container File Not Found");if(!(e=Object(s.qs)(t,"rootfile")))throw new Error("No RootFile Found");this.packagePath=e.getAttribute("full-path"),this.directory=w.a.dirname(this.packagePath),this.encoding=t.xmlEncoding}destroy(){this.packagePath=void 0,this.directory=void 0,this.encoding=void 0}};var E=class{constructor(t){this.manifest={},this.navPath="",this.ncxPath="",this.coverPath="",this.spineNodeIndex=0,this.spine=[],this.metadata={},t&&this.parse(t)}parse(t){var e,i,n;if(!t)throw new Error("Package File Not Found");if(!(e=Object(s.qs)(t,"metadata")))throw new Error("No Metadata Found");if(!(i=Object(s.qs)(t,"manifest")))throw new Error("No Manifest Found");if(!(n=Object(s.qs)(t,"spine")))throw new Error("No Spine Found");return this.manifest=this.parseManifest(i),this.navPath=this.findNavPath(i),this.ncxPath=this.findNcxPath(i,n),this.coverPath=this.findCoverPath(t),this.spineNodeIndex=Object(s.indexOfElementNode)(n),this.spine=this.parseSpine(n,this.manifest),this.uniqueIdentifier=this.findUniqueIdentifier(t),this.metadata=this.parseMetadata(e),this.metadata.direction=n.getAttribute("page-progression-direction"),{metadata:this.metadata,spine:this.spine,manifest:this.manifest,navPath:this.navPath,ncxPath:this.ncxPath,coverPath:this.coverPath,spineNodeIndex:this.spineNodeIndex}}parseMetadata(t){var e={};return e.title=this.getElementText(t,"title"),e.creator=this.getElementText(t,"creator"),e.description=this.getElementText(t,"description"),e.pubdate=this.getElementText(t,"date"),e.publisher=this.getElementText(t,"publisher"),e.identifier=this.getElementText(t,"identifier"),e.language=this.getElementText(t,"language"),e.rights=this.getElementText(t,"rights"),e.modified_date=this.getPropertyText(t,"dcterms:modified"),e.layout=this.getPropertyText(t,"rendition:layout"),e.orientation=this.getPropertyText(t,"rendition:orientation"),e.flow=this.getPropertyText(t,"rendition:flow"),e.viewport=this.getPropertyText(t,"rendition:viewport"),e.media_active_class=this.getPropertyText(t,"media:active-class"),e.spread=this.getPropertyText(t,"rendition:spread"),e}parseManifest(t){var e={},i=Object(s.qsa)(t,"item");return Array.prototype.slice.call(i).forEach((function(t){var i=t.getAttribute("id"),n=t.getAttribute("href")||"",r=t.getAttribute("media-type")||"",s=t.getAttribute("media-overlay")||"",o=t.getAttribute("properties")||"";e[i]={href:n,type:r,overlay:s,properties:o.length?o.split(" "):[]}})),e}parseSpine(t,e){var i=[],n=Object(s.qsa)(t,"itemref");return Array.prototype.slice.call(n).forEach((function(t,e){var n=t.getAttribute("idref"),r=t.getAttribute("properties")||"",s=r.length?r.split(" "):[],o={idref:n,linear:t.getAttribute("linear")||"yes",properties:s,index:e};i.push(o)})),i}findUniqueIdentifier(t){var e=t.documentElement.getAttribute("unique-identifier");if(!e)return"";var i=t.getElementById(e);return i&&"identifier"===i.localName&&"http://purl.org/dc/elements/1.1/"===i.namespaceURI&&i.childNodes.length>0?i.childNodes[0].nodeValue.trim():""}findNavPath(t){var e=Object(s.qsp)(t,"item",{properties:"nav"});return!!e&&e.getAttribute("href")}findNcxPath(t,e){var i,n=Object(s.qsp)(t,"item",{"media-type":"application/x-dtbncx+xml"});return n||(i=e.getAttribute("toc"))&&(n=t.querySelector("#"+i)),!!n&&n.getAttribute("href")}findCoverPath(t){Object(s.qs)(t,"package").getAttribute("version");var e=Object(s.qsp)(t,"item",{properties:"cover-image"});if(e)return e.getAttribute("href");var i=Object(s.qsp)(t,"meta",{name:"cover"});if(i){var n=i.getAttribute("content"),r=t.getElementById(n);return r?r.getAttribute("href"):""}return!1}getElementText(t,e){var i,n=t.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/",e);return n&&0!==n.length&&(i=n[0]).childNodes.length?i.childNodes[0].nodeValue:""}getPropertyText(t,e){var i=Object(s.qsp)(t,"meta",{property:e});return i&&i.childNodes.length?i.childNodes[0].nodeValue:""}load(t){this.metadata=t.metadata;let e=t.readingOrder||t.spine;return this.spine=e.map((t,e)=>(t.index=e,t.linear=t.linear||"yes",t)),t.resources.forEach((t,e)=>{this.manifest[e]=t,t.rel&&"cover"===t.rel[0]&&(this.coverPath=t.href)}),this.spineNodeIndex=0,this.toc=t.toc.map((t,e)=>(t.label=t.title,t)),{metadata:this.metadata,spine:this.spine,manifest:this.manifest,navPath:this.navPath,ncxPath:this.ncxPath,coverPath:this.coverPath,spineNodeIndex:this.spineNodeIndex,toc:this.toc}}destroy(){this.manifest=void 0,this.navPath=void 0,this.ncxPath=void 0,this.coverPath=void 0,this.spineNodeIndex=void 0,this.spine=void 0,this.metadata=void 0}};var S=class{constructor(t){this.toc=[],this.tocByHref={},this.tocById={},this.landmarks=[],this.landmarksByType={},this.length=0,t&&this.parse(t)}parse(t){let e,i,n=t.nodeType;n&&(e=Object(s.qs)(t,"html"),i=Object(s.qs)(t,"ncx")),n?e?(this.toc=this.parseNav(t),this.landmarks=this.parseLandmarks(t)):i&&(this.toc=this.parseNcx(t)):this.toc=this.load(t),this.length=0,this.unpack(this.toc)}unpack(t){for(var e,i=0;i<t.length;i++)(e=t[i]).href&&(this.tocByHref[e.href]=i),e.id&&(this.tocById[e.id]=i),this.length++,e.subitems.length&&this.unpack(e.subitems)}get(t){var e;return t?(0===t.indexOf("#")?e=this.tocById[t.substring(1)]:t in this.tocByHref&&(e=this.tocByHref[t]),this.getByIndex(t,e,this.toc)):this.toc}getByIndex(t,e,i){if(0===i.length)return;const n=i[e];if(!n||t!==n.id&&t!==n.href){let n;for(let r=0;r<i.length&&(n=this.getByIndex(t,e,i[r].subitems),!n);++r);return n}return n}landmark(t){var e;return t?(e=this.landmarksByType[t],this.landmarks[e]):this.landmarks}parseNav(t){var e,i,n=Object(s.querySelectorByType)(t,"nav","toc"),r=n?Object(s.qsa)(n,"li"):[],o=r.length,a={},h=[];if(!r||0===o)return h;for(e=0;e<o;++e)(i=this.navItem(r[e]))&&(a[i.id]=i,i.parent?a[i.parent].subitems.push(i):h.push(i));return h}navItem(t){let e=t.getAttribute("id")||void 0,i=Object(s.filterChildren)(t,"a",!0);if(!i)return;let n=i.getAttribute("href")||"";e||(e=n);let r,o=i.textContent||"",a=Object(s.getParentByTagName)(t,"li");if(a&&(r=a.getAttribute("id"),!r)){const t=Object(s.filterChildren)(a,"a",!0);r=t&&t.getAttribute("href")}for(;!r&&a;)if(a=Object(s.getParentByTagName)(a,"li"),a&&(r=a.getAttribute("id"),!r)){const t=Object(s.filterChildren)(a,"a",!0);r=t&&t.getAttribute("href")}return{id:e,href:n,label:o,subitems:[],parent:r}}parseLandmarks(t){var e,i,n=Object(s.querySelectorByType)(t,"nav","landmarks"),r=n?Object(s.qsa)(n,"li"):[],o=r.length,a=[];if(!r||0===o)return a;for(e=0;e<o;++e)(i=this.landmarkItem(r[e]))&&(a.push(i),this.landmarksByType[i.type]=e);return a}landmarkItem(t){let e=Object(s.filterChildren)(t,"a",!0);if(!e)return;let i=e.getAttributeNS("http://www.idpf.org/2007/ops","type")||void 0;return{href:e.getAttribute("href")||"",label:e.textContent||"",type:i}}parseNcx(t){var e,i,n=Object(s.qsa)(t,"navPoint"),r=n.length,o={},a=[];if(!n||0===r)return a;for(e=0;e<r;++e)o[(i=this.ncxItem(n[e])).id]=i,i.parent?o[i.parent].subitems.push(i):a.push(i);return a}ncxItem(t){var e,i=t.getAttribute("id")||!1,n=Object(s.qs)(t,"content").getAttribute("src"),r=Object(s.qs)(t,"navLabel"),o=r.textContent?r.textContent:"",a=t.parentNode;return!a||"navPoint"!==a.nodeName&&"navPoint"!==a.nodeName.split(":").slice(-1)[0]||(e=a.getAttribute("id")),{id:i,href:n,label:o,subitems:[],parent:e}}load(t){return t.map(t=>(t.label=t.title,t.subitems=t.children?this.load(t.children):[],t))}forEach(t){return this.toc.forEach(t)}},_={application:{ecmascript:["es","ecma"],javascript:"js",ogg:"ogx",pdf:"pdf",postscript:["ps","ai","eps","epsi","epsf","eps2","eps3"],"rdf+xml":"rdf",smil:["smi","smil"],"xhtml+xml":["xhtml","xht"],xml:["xml","xsl","xsd","opf","ncx"],zip:"zip","x-httpd-eruby":"rhtml","x-latex":"latex","x-maker":["frm","maker","frame","fm","fb","book","fbdoc"],"x-object":"o","x-shockwave-flash":["swf","swfl"],"x-silverlight":"scr","epub+zip":"epub","font-tdpfr":"pfr","inkml+xml":["ink","inkml"],json:"json","jsonml+json":"jsonml","mathml+xml":"mathml","metalink+xml":"metalink",mp4:"mp4s","omdoc+xml":"omdoc",oxps:"oxps","vnd.amazon.ebook":"azw",widget:"wgt","x-dtbook+xml":"dtb","x-dtbresource+xml":"res","x-font-bdf":"bdf","x-font-ghostscript":"gsf","x-font-linux-psf":"psf","x-font-otf":"otf","x-font-pcf":"pcf","x-font-snf":"snf","x-font-ttf":["ttf","ttc"],"x-font-type1":["pfa","pfb","pfm","afm"],"x-font-woff":"woff","x-mobipocket-ebook":["prc","mobi"],"x-mspublisher":"pub","x-nzb":"nzb","x-tgif":"obj","xaml+xml":"xaml","xml-dtd":"dtd","xproc+xml":"xpl","xslt+xml":"xslt","internet-property-stream":"acx","x-compress":"z","x-compressed":"tgz","x-gzip":"gz"},audio:{flac:"flac",midi:["mid","midi","kar","rmi"],mpeg:["mpga","mpega","mp2","mp3","m4a","mp2a","m2a","m3a"],mpegurl:"m3u",ogg:["oga","ogg","spx"],"x-aiff":["aif","aiff","aifc"],"x-ms-wma":"wma","x-wav":"wav",adpcm:"adp",mp4:"mp4a",webm:"weba","x-aac":"aac","x-caf":"caf","x-matroska":"mka","x-pn-realaudio-plugin":"rmp",xm:"xm",mid:["mid","rmi"]},image:{gif:"gif",ief:"ief",jpeg:["jpeg","jpg","jpe"],pcx:"pcx",png:"png","svg+xml":["svg","svgz"],tiff:["tiff","tif"],"x-icon":"ico",bmp:"bmp",webp:"webp","x-pict":["pic","pct"],"x-tga":"tga","cis-cod":"cod"},text:{"cache-manifest":["manifest","appcache"],css:"css",csv:"csv",html:["html","htm","shtml","stm"],mathml:"mml",plain:["txt","text","brf","conf","def","list","log","in","bas"],richtext:"rtx","tab-separated-values":"tsv","x-bibtex":"bib"},video:{mpeg:["mpeg","mpg","mpe","m1v","m2v","mp2","mpa","mpv2"],mp4:["mp4","mp4v","mpg4"],quicktime:["qt","mov"],ogg:"ogv","vnd.mpegurl":["mxu","m4u"],"x-flv":"flv","x-la-asf":["lsf","lsx"],"x-mng":"mng","x-ms-asf":["asf","asx","asr"],"x-ms-wm":"wm","x-ms-wmv":"wmv","x-ms-wmx":"wmx","x-ms-wvx":"wvx","x-msvideo":"avi","x-sgi-movie":"movie","x-matroska":["mpv","mkv","mk3d","mks"],"3gpp2":"3g2",h261:"h261",h263:"h263",h264:"h264",jpeg:"jpgv",jpm:["jpm","jpgm"],mj2:["mj2","mjp2"],"vnd.ms-playready.media.pyv":"pyv","vnd.uvvu.mp4":["uvu","uvvu"],"vnd.vivo":"viv",webm:"webm","x-f4v":"f4v","x-m4v":"m4v","x-ms-vob":"vob","x-smv":"smv"}},O=function(){var t,e,i,n,r={};for(t in _)if(_.hasOwnProperty(t))for(e in _[t])if(_[t].hasOwnProperty(e))if("string"==typeof(i=_[t][e]))r[i]=t+"/"+e;else for(n=0;n<i.length;n++)r[i[n]]=t+"/"+e;return r}();var C={lookup:function(t){return t&&O[t.split(".").pop().toLowerCase()]||"text/plain"}};var T=class{constructor(t,e){this.settings={replacements:e&&e.replacements||"base64",archive:e&&e.archive,resolver:e&&e.resolver,request:e&&e.request},this.process(t)}process(t){this.manifest=t,this.resources=Object.keys(t).map((function(e){return t[e]})),this.replacementUrls=[],this.html=[],this.assets=[],this.css=[],this.urls=[],this.cssUrls=[],this.split(),this.splitUrls()}split(){this.html=this.resources.filter((function(t){if("application/xhtml+xml"===t.type||"text/html"===t.type)return!0})),this.assets=this.resources.filter((function(t){if("application/xhtml+xml"!==t.type&&"text/html"!==t.type)return!0})),this.css=this.resources.filter((function(t){if("text/css"===t.type)return!0}))}splitUrls(){this.urls=this.assets.map(function(t){return t.href}.bind(this)),this.cssUrls=this.css.map((function(t){return t.href}))}createUrl(t){var e=new o.a(t),i=C.lookup(e.filename);return this.settings.archive?this.settings.archive.createUrl(t,{base64:"base64"===this.settings.replacements}):"base64"===this.settings.replacements?this.settings.request(t,"blob").then(t=>Object(s.blob2base64)(t)).then(t=>Object(s.createBase64Url)(t,i)):this.settings.request(t,"blob").then(t=>Object(s.createBlobUrl)(t,i))}replacements(){if("none"===this.settings.replacements)return new Promise(function(t){t(this.urls)}.bind(this));var t=this.urls.map(t=>{var e=this.settings.resolver(t);return this.createUrl(e).catch(t=>(console.error(t),null))});return Promise.all(t).then(t=>(this.replacementUrls=t.filter(t=>"string"==typeof t),t))}replaceCss(t,e){var i=[];return t=t||this.settings.archive,e=e||this.settings.resolver,this.cssUrls.forEach(function(n){var r=this.createCssFile(n,t,e).then(function(t){var e=this.urls.indexOf(n);e>-1&&(this.replacementUrls[e]=t)}.bind(this));i.push(r)}.bind(this)),Promise.all(i)}createCssFile(t){if(w.a.isAbsolute(t))return new Promise((function(t){t()}));var e,i=this.settings.resolver(t);e=this.settings.archive?this.settings.archive.getText(i):this.settings.request(i,"text");var n=this.urls.map(t=>{var e=this.settings.resolver(t);return new a.a(i).relative(e)});return e?e.then(t=>(t=Object(c.e)(t,n,this.replacementUrls),"base64"===this.settings.replacements?Object(s.createBase64Url)(t,"text/css"):Object(s.createBlobUrl)(t,"text/css")),t=>new Promise((function(t){t()}))):new Promise((function(t){t()}))}relativeTo(t,e){return e=e||this.settings.resolver,this.urls.map(function(i){var n=e(i);return new a.a(t).relative(n)}.bind(this))}get(t){var e=this.urls.indexOf(t);if(-1!==e)return this.replacementUrls.length?new Promise(function(t,i){t(this.replacementUrls[e])}.bind(this)):this.createUrl(t)}substitute(t,e){var i;return i=e?this.relativeTo(e):this.urls,Object(c.e)(t,i,this.replacementUrls)}destroy(){this.settings=void 0,this.manifest=void 0,this.resources=void 0,this.replacementUrls=void 0,this.html=void 0,this.assets=void 0,this.css=void 0,this.urls=void 0,this.cssUrls=void 0}};var k=class{constructor(t){this.pages=[],this.locations=[],this.epubcfi=new h.a,this.firstPage=0,this.lastPage=0,this.totalPages=0,this.toc=void 0,this.ncx=void 0,t&&(this.pageList=this.parse(t)),this.pageList&&this.pageList.length&&this.process(this.pageList)}parse(t){var e=Object(s.qs)(t,"html"),i=Object(s.qs)(t,"ncx");return e?this.parseNav(t):i?this.parseNcx(t):void 0}parseNav(t){var e,i,n=Object(s.querySelectorByType)(t,"nav","page-list"),r=n?Object(s.qsa)(n,"li"):[],o=r.length,a=[];if(!r||0===o)return a;for(e=0;e<o;++e)i=this.item(r[e]),a.push(i);return a}parseNcx(t){var e,i,n,r,o=[],a=0;if(!(i=Object(s.qs)(t,"pageList")))return o;if(r=(n=Object(s.qsa)(i,"pageTarget")).length,!n||0===n.length)return o;for(a=0;a<r;++a)e=this.ncxItem(n[a]),o.push(e);return o}ncxItem(t){var e=Object(s.qs)(t,"navLabel"),i=Object(s.qs)(e,"text").textContent;return{href:Object(s.qs)(t,"content").getAttribute("src"),page:parseInt(i,10)}}item(t){var e,i,n=Object(s.qs)(t,"a"),r=n.getAttribute("href")||"",o=n.textContent||"",a=parseInt(o);return-1!=r.indexOf("epubcfi")?(i=(e=r.split("#"))[0],{cfi:e.length>1&&e[1],href:r,packageUrl:i,page:a}):{href:r,page:a}}process(t){t.forEach((function(t){this.pages.push(t.page),t.cfi&&this.locations.push(t.cfi)}),this),this.firstPage=parseInt(this.pages[0]),this.lastPage=parseInt(this.pages[this.pages.length-1]),this.totalPages=this.lastPage-this.firstPage}pageFromCfi(t){var e=-1;if(0===this.locations.length)return-1;var i=Object(s.indexOfSorted)(t,this.locations,this.epubcfi.compare);return-1!=i?e=this.pages[i]:void 0!==(e=(i=Object(s.locationOf)(t,this.locations,this.epubcfi.compare))-1>=0?this.pages[i-1]:this.pages[0])||(e=-1),e}cfiFromPage(t){var e=-1;"number"!=typeof t&&(t=parseInt(t));var i=this.pages.indexOf(t);return-1!=i&&(e=this.locations[i]),e}pageFromPercentage(t){return Math.round(this.totalPages*t)}percentageFromPage(t){var e=(t-this.firstPage)/this.totalPages;return Math.round(1e3*e)/1e3}percentageFromCfi(t){var e=this.pageFromCfi(t);return this.percentageFromPage(e)}destroy(){this.pages=void 0,this.locations=void 0,this.epubcfi=void 0,this.pageList=void 0,this.toc=void 0,this.ncx=void 0}},R=i(39),L=i(85),I=i.n(L);var j=class{constructor(){this.zip=void 0,this.urlCache={},this.checkRequirements()}checkRequirements(){try{this.zip=new I.a}catch(t){throw new Error("JSZip lib not loaded")}}open(t,e){return this.zip.loadAsync(t,{base64:e})}openUrl(t,e){return u(t,"binary").then(function(t){return this.zip.loadAsync(t,{base64:e})}.bind(this))}request(t,e){var i,n=new s.defer,r=new a.a(t);return e||(e=r.extension),(i="blob"==e?this.getBlob(t):this.getText(t))?i.then(function(t){let i=this.handleResponse(t,e);n.resolve(i)}.bind(this)):n.reject({message:"File not found in the epub: "+t,stack:(new Error).stack}),n.promise}handleResponse(t,e){return"json"==e?JSON.parse(t):Object(s.isXml)(e)?Object(s.parse)(t,"text/xml"):"xhtml"==e?Object(s.parse)(t,"application/xhtml+xml"):"html"==e||"htm"==e?Object(s.parse)(t,"text/html"):t}getBlob(t,e){var i=window.decodeURIComponent(t.substr(1)),n=this.zip.file(i);if(n)return e=e||C.lookup(n.name),n.async("uint8array").then((function(t){return new Blob([t],{type:e})}))}getText(t,e){var i=window.decodeURIComponent(t.substr(1)),n=this.zip.file(i);if(n)return n.async("string").then((function(t){return t}))}getBase64(t,e){var i=window.decodeURIComponent(t.substr(1)),n=this.zip.file(i);if(n)return e=e||C.lookup(n.name),n.async("base64").then((function(t){return"data:"+e+";base64,"+t}))}createUrl(t,e){var i,n,r=new s.defer,o=window.URL||window.webkitURL||window.mozURL,a=e&&e.base64;return t in this.urlCache?(r.resolve(this.urlCache[t]),r.promise):(a?(n=this.getBase64(t))&&n.then(function(e){this.urlCache[t]=e,r.resolve(e)}.bind(this)):(n=this.getBlob(t))&&n.then(function(e){i=o.createObjectURL(e),this.urlCache[t]=i,r.resolve(i)}.bind(this)),n||r.reject({message:"File not found in the epub: "+t,stack:(new Error).stack}),r.promise)}revokeUrl(t){var e=window.URL||window.webkitURL||window.mozURL,i=this.urlCache[t];i&&e.revokeObjectURL(i)}destroy(){var t=window.URL||window.webkitURL||window.mozURL;for(let e in this.urlCache)t.revokeObjectURL(e);this.zip=void 0,this.urlCache={}}},N=i(57),A=i.n(N);class P{constructor(t,e,i){this.urlCache={},this.storage=void 0,this.name=t,this.requester=e||u,this.resolver=i,this.online=!0,this.checkRequirements(),this.addListeners()}checkRequirements(){try{let t;void 0===A.a&&(t=A.a),this.storage=t.createInstance({name:this.name})}catch(t){throw new Error("localForage lib not loaded")}}addListeners(){this._status=this.status.bind(this),window.addEventListener("online",this._status),window.addEventListener("offline",this._status)}removeListeners(){window.removeEventListener("online",this._status),window.removeEventListener("offline",this._status),this._status=void 0}status(t){let e=navigator.onLine;this.online=e,e?this.emit("online",this):this.emit("offline",this)}add(t,e){let i=t.resources.map(t=>{let{href:i}=t,n=this.resolver(i),r=window.encodeURIComponent(n);return this.storage.getItem(r).then(t=>!t||e?this.requester(n,"binary").then(t=>this.storage.setItem(r,t)):t)});return Promise.all(i)}put(t,e,i){let n=window.encodeURIComponent(t);return this.storage.getItem(n).then(r=>r||this.requester(t,"binary",e,i).then(t=>this.storage.setItem(n,t)))}request(t,e,i,n){return this.online?this.requester(t,e,i,n).then(e=>(this.put(t),e)):this.retrieve(t,e)}retrieve(t,e){new s.defer;var i=new a.a(t);return e||(e=i.extension),("blob"==e?this.getBlob(t):this.getText(t)).then(i=>{var n,r=new s.defer;return i?(n=this.handleResponse(i,e),r.resolve(n)):r.reject({message:"File not found in storage: "+t,stack:(new Error).stack}),r.promise})}handleResponse(t,e){return"json"==e?JSON.parse(t):Object(s.isXml)(e)?Object(s.parse)(t,"text/xml"):"xhtml"==e?Object(s.parse)(t,"application/xhtml+xml"):"html"==e||"htm"==e?Object(s.parse)(t,"text/html"):t}getBlob(t,e){let i=window.encodeURIComponent(t);return this.storage.getItem(i).then((function(i){if(i)return e=e||C.lookup(t),new Blob([i],{type:e})}))}getText(t,e){let i=window.encodeURIComponent(t);return e=e||C.lookup(t),this.storage.getItem(i).then((function(t){var i,n=new s.defer,r=new FileReader;if(t)return i=new Blob([t],{type:e}),r.addEventListener("loadend",()=>{n.resolve(r.result)}),r.readAsText(i,e),n.promise}))}getBase64(t,e){let i=window.encodeURIComponent(t);return e=e||C.lookup(t),this.storage.getItem(i).then(t=>{var i,n=new s.defer,r=new FileReader;if(t)return i=new Blob([t],{type:e}),r.addEventListener("loadend",()=>{n.resolve(r.result)}),r.readAsDataURL(i,e),n.promise})}createUrl(t,e){var i,n,r=new s.defer,o=window.URL||window.webkitURL||window.mozURL,a=e&&e.base64;return t in this.urlCache?(r.resolve(this.urlCache[t]),r.promise):(a?(n=this.getBase64(t))&&n.then(function(e){this.urlCache[t]=e,r.resolve(e)}.bind(this)):(n=this.getBlob(t))&&n.then(function(e){i=o.createObjectURL(e),this.urlCache[t]=i,r.resolve(i)}.bind(this)),n||r.reject({message:"File not found in storage: "+t,stack:(new Error).stack}),r.promise)}revokeUrl(t){var e=window.URL||window.webkitURL||window.mozURL,i=this.urlCache[t];i&&e.revokeObjectURL(i)}destroy(){var t=window.URL||window.webkitURL||window.mozURL;for(let e in this.urlCache)t.revokeObjectURL(e);this.urlCache={},this.removeListeners()}}r()(P.prototype);var D=P;var z=class{constructor(t){this.interactive="",this.fixedLayout="",this.openToSpread="",this.orientationLock="",t&&this.parse(t)}parse(t){if(!t)return this;const e=Object(s.qs)(t,"display_options");if(!e)return this;return Object(s.qsa)(e,"option").forEach(t=>{let e="";switch(t.childNodes.length&&(e=t.childNodes[0].nodeValue),t.attributes.name.value){case"interactive":this.interactive=e;break;case"fixed-layout":this.fixedLayout=e;break;case"open-to-spread":this.openToSpread=e;break;case"orientation-lock":this.orientationLock=e}}),this}destroy(){this.interactive=void 0,this.fixedLayout=void 0,this.openToSpread=void 0,this.orientationLock=void 0}};const B="binary",q="base64",M="epub",U="opf",F="json",W="directory";class H{constructor(t,e){void 0===e&&"string"!=typeof t&&t instanceof Blob==!1&&t instanceof ArrayBuffer==!1&&(e=t,t=void 0),this.settings=Object(s.extend)(this.settings||{},{requestMethod:void 0,requestCredentials:void 0,requestHeaders:void 0,encoding:void 0,replacements:void 0,canonical:void 0,openAs:void 0,store:void 0}),Object(s.extend)(this.settings,e),this.opening=new s.defer,this.opened=this.opening.promise,this.isOpen=!1,this.loading={manifest:new s.defer,spine:new s.defer,metadata:new s.defer,cover:new s.defer,navigation:new s.defer,pageList:new s.defer,resources:new s.defer,displayOptions:new s.defer},this.loaded={manifest:this.loading.manifest.promise,spine:this.loading.spine.promise,metadata:this.loading.metadata.promise,cover:this.loading.cover.promise,navigation:this.loading.navigation.promise,pageList:this.loading.pageList.promise,resources:this.loading.resources.promise,displayOptions:this.loading.displayOptions.promise},this.ready=Promise.all([this.loaded.manifest,this.loaded.spine,this.loaded.metadata,this.loaded.cover,this.loaded.navigation,this.loaded.resources,this.loaded.displayOptions]),this.isRendered=!1,this.request=this.settings.requestMethod||u,this.spine=new p,this.locations=new y(this.spine,this.load.bind(this)),this.navigation=void 0,this.pageList=void 0,this.url=void 0,this.path=void 0,this.archived=!1,this.archive=void 0,this.storage=void 0,this.resources=void 0,this.rendition=void 0,this.container=void 0,this.packaging=void 0,this.displayOptions=void 0,this.settings.store&&this.store(this.settings.store),t&&this.open(t,this.settings.openAs).catch(e=>{var i=new Error("Cannot load book at "+t);this.emit(v.c.BOOK.OPEN_FAILED,i)})}open(t,e){var i,n=e||this.determineType(t);return n===B?(this.archived=!0,this.url=new o.a("/",""),i=this.openEpub(t)):n===q?(this.archived=!0,this.url=new o.a("/",""),i=this.openEpub(t,n)):n===M?(this.archived=!0,this.url=new o.a("/",""),i=this.request(t,"binary",this.settings.requestCredentials,this.settings.requestHeaders).then(this.openEpub.bind(this))):n==U?(this.url=new o.a(t),i=this.openPackaging(this.url.Path.toString())):n==F?(this.url=new o.a(t),i=this.openManifest(this.url.Path.toString())):(this.url=new o.a(t),i=this.openContainer("META-INF/container.xml").then(this.openPackaging.bind(this))),i}openEpub(t,e){return this.unarchive(t,e||this.settings.encoding).then(()=>this.openContainer("META-INF/container.xml")).then(t=>this.openPackaging(t))}openContainer(t){return this.load(t).then(t=>(this.container=new x(t),this.resolve(this.container.packagePath)))}openPackaging(t){return this.path=new a.a(t),this.load(t).then(t=>(this.packaging=new E(t),this.unpack(this.packaging)))}openManifest(t){return this.path=new a.a(t),this.load(t).then(t=>(this.packaging=new E,this.packaging.load(t),this.unpack(this.packaging)))}load(t){var e=this.resolve(t);return this.archived?this.archive.request(e):this.request(e,null,this.settings.requestCredentials,this.settings.requestHeaders)}resolve(t,e){if(t){var i=t;return t.indexOf("://")>-1?t:(this.path&&(i=this.path.resolve(t)),0!=e&&this.url&&(i=this.url.resolve(i)),i)}}canonical(t){return t?this.settings.canonical?this.settings.canonical(t):this.resolve(t,!0):""}determineType(t){var e;return"base64"===this.settings.encoding?q:"string"!=typeof t?B:((e=new o.a(t).path().extension)&&(e=e.replace(/\?.*$/,"")),e?"epub"===e?M:"opf"===e?U:"json"===e?F:void 0:W)}unpack(t){this.package=t,""===this.packaging.metadata.layout?this.load(this.url.resolve("META-INF/com.apple.ibooks.display-options.xml")).then(t=>{this.displayOptions=new z(t),this.loading.displayOptions.resolve(this.displayOptions)}).catch(t=>{this.displayOptions=new z,this.loading.displayOptions.resolve(this.displayOptions)}):(this.displayOptions=new z,this.loading.displayOptions.resolve(this.displayOptions)),this.spine.unpack(this.packaging,this.resolve.bind(this),this.canonical.bind(this)),this.resources=new T(this.packaging.manifest,{archive:this.archive,resolver:this.resolve.bind(this),request:this.request.bind(this),replacements:this.settings.replacements||(this.archived?"blobUrl":"base64")}),this.loadNavigation(this.packaging).then(()=>{this.loading.navigation.resolve(this.navigation)}),this.packaging.coverPath&&(this.cover=this.resolve(this.packaging.coverPath)),this.loading.manifest.resolve(this.packaging.manifest),this.loading.metadata.resolve(this.packaging.metadata),this.loading.spine.resolve(this.spine),this.loading.cover.resolve(this.cover),this.loading.resources.resolve(this.resources),this.loading.pageList.resolve(this.pageList),this.isOpen=!0,this.archived||this.settings.replacements&&"none"!=this.settings.replacements?this.replacements().then(()=>{this.loaded.displayOptions.then(()=>{this.opening.resolve(this)})}).catch(t=>{console.error(t)}):this.loaded.displayOptions.then(()=>{this.opening.resolve(this)})}loadNavigation(t){let e=t.navPath||t.ncxPath,i=t.toc;return i?new Promise((e,n)=>{this.navigation=new S(i),t.pageList&&(this.pageList=new k(t.pageList)),e(this.navigation)}):e?this.load(e,"xml").then(t=>(this.navigation=new S(t),this.pageList=new k(t),this.navigation)):new Promise((t,e)=>{this.navigation=new S,this.pageList=new k,t(this.navigation)})}section(t){return this.spine.get(t)}renderTo(t,e){return this.rendition=new R.a(this,e),this.rendition.attachTo(t),this.rendition}setRequestCredentials(t){this.settings.requestCredentials=t}setRequestHeaders(t){this.settings.requestHeaders=t}unarchive(t,e){return this.archive=new j,this.archive.open(t,e)}store(t){let e=this.settings.replacements&&"none"!==this.settings.replacements,i=this.url,n=this.settings.requestMethod||u.bind(this);return this.storage=new D(t,n,this.resolve.bind(this)),this.request=this.storage.request.bind(this.storage),this.opened.then(()=>{this.archived&&(this.storage.requester=this.archive.request.bind(this.archive));let t=(t,e)=>{e.output=this.resources.substitute(t,e.url)};this.resources.settings.replacements=e||"blobUrl",this.resources.replacements().then(()=>this.resources.replaceCss()),this.storage.on("offline",()=>{this.url=new o.a("/",""),this.spine.hooks.serialize.register(t)}),this.storage.on("online",()=>{this.url=i,this.spine.hooks.serialize.deregister(t)})}),this.storage}coverUrl(){return this.loaded.cover.then(()=>this.cover?this.archived?this.archive.createUrl(this.cover):this.cover:null)}replacements(){return this.spine.hooks.serialize.register((t,e)=>{e.output=this.resources.substitute(t,e.url)}),this.resources.replacements().then(()=>this.resources.replaceCss())}getRange(t){var e=new h.a(t),i=this.spine.get(e.spinePos),n=this.load.bind(this);return i?i.load(n).then((function(t){return e.toRange(i.document)})):new Promise((t,e)=>{e("CFI could not be found")})}key(t){var e=t||this.packaging.metadata.identifier||this.url.filename;return`epubjs:${v.b}:${e}`}destroy(){this.opened=void 0,this.loading=void 0,this.loaded=void 0,this.ready=void 0,this.isOpen=!1,this.isRendered=!1,this.spine&&this.spine.destroy(),this.locations&&this.locations.destroy(),this.pageList&&this.pageList.destroy(),this.archive&&this.archive.destroy(),this.resources&&this.resources.destroy(),this.container&&this.container.destroy(),this.packaging&&this.packaging.destroy(),this.rendition&&this.rendition.destroy(),this.displayOptions&&this.displayOptions.destroy(),this.spine=void 0,this.locations=void 0,this.pageList=void 0,this.archive=void 0,this.resources=void 0,this.container=void 0,this.packaging=void 0,this.rendition=void 0,this.navigation=void 0,this.url=void 0,this.path=void 0,this.archived=!1}}r()(H.prototype);e.a=H},function(t,e,i){var n=i(16),r=i(60),s=i(25),o=i(32),a=i(41),h=i(10),l=i(62),c=Object.getOwnPropertyDescriptor;e.f=n?c:function(t,e){if(t=o(t),e=a(e,!0),l)try{return c(t,e)}catch(t){}if(h(t,e))return s(!r.f.call(t,e),t[e])}},function(t,e,i){"use strict";var n={}.propertyIsEnumerable,r=Object.getOwnPropertyDescriptor,s=r&&!n.call({1:2},1);e.f=s?function(t){var e=r(this,t);return!!e&&e.enumerable}:n},function(t,e,i){var n=i(12),r=i(40),s="".split;t.exports=n((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==r(t)?s.call(t,""):Object(t)}:Object},function(t,e,i){var n=i(16),r=i(12),s=i(63);t.exports=!n&&!r((function(){return 7!=Object.defineProperty(s("div"),"a",{get:function(){return 7}}).a}))},function(t,e,i){var n=i(7),r=i(17),s=n.document,o=r(s)&&r(s.createElement);t.exports=function(t){return o?s.createElement(t):{}}},function(t,e,i){var n=i(65),r=Function.toString;"function"!=typeof n.inspectSource&&(n.inspectSource=function(t){return r.call(t)}),t.exports=n.inspectSource},function(t,e,i){var n=i(7),r=i(42),s=n["__core-js_shared__"]||r("__core-js_shared__",{});t.exports=s},function(t,e,i){var n=i(34),r=i(65);(t.exports=function(t,e){return r[t]||(r[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.5",mode:n?"pure":"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})},function(t,e){var i=0,n=Math.random();t.exports=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++i+n).toString(36)}},function(t,e,i){var n=i(10),r=i(32),s=i(94).indexOf,o=i(44);t.exports=function(t,e){var i,a=r(t),h=0,l=[];for(i in a)!n(o,i)&&n(a,i)&&l.push(i);for(;e.length>h;)n(a,i=e[h++])&&(~s(l,i)||l.push(i));return l}},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e,i){var n=i(12);t.exports=!!Object.getOwnPropertySymbols&&!n((function(){return!String(Symbol())}))},function(t,e,i){"use strict";var n=i(32),r=i(103),s=i(27),o=i(26),a=i(74),h=o.set,l=o.getterFor("Array Iterator");t.exports=a(Array,"Array",(function(t,e){h(this,{type:"Array Iterator",target:n(t),index:0,kind:e})}),(function(){var t=l(this),e=t.target,i=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==i?{value:n,done:!1}:"values"==i?{value:e[n],done:!1}:{value:[n,e[n]],done:!1}}),"values"),s.Arguments=s.Array,r("keys"),r("values"),r("entries")},function(t,e,i){var n=i(16),r=i(18),s=i(13),o=i(73);t.exports=n?Object.defineProperties:function(t,e){s(t);for(var i,n=o(e),a=n.length,h=0;a>h;)r.f(t,i=n[h++],e[i]);return t}},function(t,e,i){var n=i(68),r=i(47);t.exports=Object.keys||function(t){return n(t,r)}},function(t,e,i){"use strict";var n=i(31),r=i(75),s=i(77),o=i(106),a=i(37),h=i(15),l=i(19),c=i(8),u=i(34),d=i(27),f=i(76),p=f.IteratorPrototype,g=f.BUGGY_SAFARI_ITERATORS,v=c("iterator"),m=function(){return this};t.exports=function(t,e,i,c,f,y,b){r(i,e,c);var w,x,E,S=function(t){if(t===f&&k)return k;if(!g&&t in C)return C[t];switch(t){case"keys":case"values":case"entries":return function(){return new i(this,t)}}return function(){return new i(this)}},_=e+" Iterator",O=!1,C=t.prototype,T=C[v]||C["@@iterator"]||f&&C[f],k=!g&&T||S(f),R="Array"==e&&C.entries||T;if(R&&(w=s(R.call(new t)),p!==Object.prototype&&w.next&&(u||s(w)===p||(o?o(w,p):"function"!=typeof w[v]&&h(w,v,m)),a(w,_,!0,!0),u&&(d[_]=m))),"values"==f&&T&&"values"!==T.name&&(O=!0,k=function(){return T.call(this)}),u&&!b||C[v]===k||h(C,v,k),d[e]=k,f)if(x={values:S("values"),keys:y?k:S("keys"),entries:S("entries")},b)for(E in x)(g||O||!(E in C))&&l(C,E,x[E]);else n({target:e,proto:!0,forced:g||O},x);return x}},function(t,e,i){"use strict";var n=i(76).IteratorPrototype,r=i(50),s=i(25),o=i(37),a=i(27),h=function(){return this};t.exports=function(t,e,i){var l=e+" Iterator";return t.prototype=r(n,{next:s(1,i)}),o(t,l,!1,!0),a[l]=h,t}},function(t,e,i){"use strict";var n,r,s,o=i(77),a=i(15),h=i(10),l=i(8),c=i(34),u=l("iterator"),d=!1;[].keys&&("next"in(s=[].keys())?(r=o(o(s)))!==Object.prototype&&(n=r):d=!0),null==n&&(n={}),c||h(n,u)||a(n,u,(function(){return this})),t.exports={IteratorPrototype:n,BUGGY_SAFARI_ITERATORS:d}},function(t,e,i){var n=i(10),r=i(36),s=i(43),o=i(105),a=s("IE_PROTO"),h=Object.prototype;t.exports=o?Object.getPrototypeOf:function(t){return t=r(t),n(t,a)?t[a]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?h:null}},function(t,e,i){var n=i(12),r=i(8),s=i(34),o=r("iterator");t.exports=!n((function(){var t=new URL("b?a=1&b=2&c=3","http://a"),e=t.searchParams,i="";return t.pathname="c%20d",e.forEach((function(t,n){e.delete("b"),i+=n+t})),s&&!t.toJSON||!e.sort||"http://a/c%20d?a=1&c=3"!==t.href||"3"!==e.get("c")||"a=1"!==String(new URLSearchParams("?a=1"))||!e[o]||"a"!==new URL("https://a@b").username||"b"!==new URLSearchParams(new URLSearchParams("a=b")).get("a")||"xn--e1aybc"!==new URL("http://тест").host||"#%D0%B1"!==new URL("http://a#б").hash||"a1c3"!==i||"x"!==new URL("http://x",void 0).host}))},function(t,e){t.exports=function(t,e,i){if(!(t instanceof e))throw TypeError("Incorrect "+(i?i+" ":"")+"invocation");return t}},function(t,e,i){var n=i(126);t.exports=function(t,e,i){if(n(t),void 0===e)return t;switch(i){case 0:return function(){return t.call(e)};case 1:return function(i){return t.call(e,i)};case 2:return function(i,n){return t.call(e,i,n)};case 3:return function(i,n,r){return t.call(e,i,n,r)}}return function(){return t.apply(e,arguments)}}},function(t,e,i){var n=i(130),r=i(40),s=i(8)("toStringTag"),o="Arguments"==r(function(){return arguments}());t.exports=n?r:function(t){var e,i,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(i=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),s))?i:o?r(e):"Object"==(n=r(e))&&"function"==typeof e.callee?"Arguments":n}},function(t,e,i){var n=i(138),r="object"==typeof self&&self&&self.Object===Object&&self,s=n||r||Function("return this")();t.exports=s},function(t,e,i){var n=i(82).Symbol;t.exports=n},function(t,e,i){var n=i(55),r=i(53);t.exports=function(t,e,i){var s=!0,o=!0;if("function"!=typeof t)throw new TypeError("Expected a function");return r(i)&&(s="leading"in i?!!i.leading:s,o="trailing"in i?!!i.trailing:o),n(t,e,{leading:s,maxWait:e,trailing:o})}},function(t,i){t.exports=e},function(t,e,i){"use strict";i.r(e),function(t){var n=i(58),r=i(39),s=i(2),o=i(28),a=i(0),h=i(1);i(54),i(22),i(56);function l(t,e){return new n.a(t,e)}l.VERSION=h.b,void 0!==t&&(t.EPUBJS_VERSION=h.b),l.Book=n.a,l.Rendition=r.a,l.Contents=o.a,l.CFI=s.a,l.utils=a,e.default=l}.call(this,i(30))},function(t,e,i){"use strict";i(88);var n=i(19),r=i(12),s=i(8),o=i(48),a=i(15),h=s("species"),l=!r((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),c="$0"==="a".replace(/./,"$0"),u=s("replace"),d=!!/./[u]&&""===/./[u]("a","$0"),f=!r((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var i="ab".split(t);return 2!==i.length||"a"!==i[0]||"b"!==i[1]}));t.exports=function(t,e,i,u){var p=s(t),g=!r((function(){var e={};return e[p]=function(){return 7},7!=""[t](e)})),v=g&&!r((function(){var e=!1,i=/a/;return"split"===t&&((i={}).constructor={},i.constructor[h]=function(){return i},i.flags="",i[p]=/./[p]),i.exec=function(){return e=!0,null},i[p](""),!e}));if(!g||!v||"replace"===t&&(!l||!c||d)||"split"===t&&!f){var m=/./[p],y=i(p,""[t],(function(t,e,i,n,r){return e.exec===o?g&&!r?{done:!0,value:m.call(e,i,n)}:{done:!0,value:t.call(i,e,n)}:{done:!1}}),{REPLACE_KEEPS_$0:c,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:d}),b=y[0],w=y[1];n(String.prototype,t,b),n(RegExp.prototype,p,2==e?function(t,e){return w.call(t,this,e)}:function(t){return w.call(t,this)})}u&&a(RegExp.prototype[p],"sham",!0)}},function(t,e,i){"use strict";var n=i(31),r=i(48);n({target:"RegExp",proto:!0,forced:/./.exec!==r},{exec:r})},function(t,e,i){var n=i(7),r=i(64),s=n.WeakMap;t.exports="function"==typeof s&&/native code/.test(r(s))},function(t,e,i){var n=i(10),r=i(91),s=i(59),o=i(18);t.exports=function(t,e){for(var i=r(e),a=o.f,h=s.f,l=0;l<i.length;l++){var c=i[l];n(t,c)||a(t,c,h(e,c))}}},function(t,e,i){var n=i(45),r=i(93),s=i(69),o=i(13);t.exports=n("Reflect","ownKeys")||function(t){var e=r.f(o(t)),i=s.f;return i?e.concat(i(t)):e}},function(t,e,i){var n=i(7);t.exports=n},function(t,e,i){var n=i(68),r=i(47).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return n(t,r)}},function(t,e,i){var n=i(32),r=i(46),s=i(95),o=function(t){return function(e,i,o){var a,h=n(e),l=r(h.length),c=s(o,l);if(t&&i!=i){for(;l>c;)if((a=h[c++])!=a)return!0}else for(;l>c;c++)if((t||c in h)&&h[c]===i)return t||c||0;return!t&&-1}};t.exports={includes:o(!0),indexOf:o(!1)}},function(t,e,i){var n=i(35),r=Math.max,s=Math.min;t.exports=function(t,e){var i=n(t);return i<0?r(i+e,0):s(i,e)}},function(t,e,i){var n=i(12),r=/#|\.prototype\./,s=function(t,e){var i=a[o(t)];return i==l||i!=h&&("function"==typeof e?n(e):!!e)},o=s.normalize=function(t){return String(t).replace(r,".").toLowerCase()},a=s.data={},h=s.NATIVE="N",l=s.POLYFILL="P";t.exports=s},function(t,e,i){"use strict";var n=i(13);t.exports=function(){var t=n(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},function(t,e,i){"use strict";var n=i(12);function r(t,e){return RegExp(t,e)}e.UNSUPPORTED_Y=n((function(){var t=r("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),e.BROKEN_CARET=n((function(){var t=r("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},function(t,e,i){var n=i(70);t.exports=n&&!Symbol.sham&&"symbol"==typeof Symbol.iterator},function(t,e,i){"use strict";var n=i(49).charAt;t.exports=function(t,e,i){return e+(i?n(t,e).length:1)}},function(t,e,i){var n=i(40),r=i(48);t.exports=function(t,e){var i=t.exec;if("function"==typeof i){var s=i.call(t,e);if("object"!=typeof s)throw TypeError("RegExp exec method returned something other than an Object or null");return s}if("RegExp"!==n(t))throw TypeError("RegExp#exec called on incompatible receiver");return r.call(t,e)}},function(t,e){t.exports={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}},function(t,e,i){var n=i(8),r=i(50),s=i(18),o=n("unscopables"),a=Array.prototype;null==a[o]&&s.f(a,o,{configurable:!0,value:r(null)}),t.exports=function(t){a[o][t]=!0}},function(t,e,i){var n=i(45);t.exports=n("document","documentElement")},function(t,e,i){var n=i(12);t.exports=!n((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype}))},function(t,e,i){var n=i(13),r=i(107);t.exports=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,i={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(i,[]),e=i instanceof Array}catch(t){}return function(i,s){return n(i),r(s),e?t.call(i,s):i.__proto__=s,i}}():void 0)},function(t,e,i){var n=i(17);t.exports=function(t){if(!n(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype");return t}},function(t,e,i){"use strict";var n=i(109),r=i(117),s=i(118),o=i(119);(t.exports=function(t,e){var i,s,a,h,l;return arguments.length<2||"string"!=typeof t?(h=e,e=t,t=null):h=arguments[2],null==t?(i=a=!0,s=!1):(i=o.call(t,"c"),s=o.call(t,"e"),a=o.call(t,"w")),l={value:e,configurable:i,enumerable:s,writable:a},h?n(r(h),l):l}).gs=function(t,e,i){var a,h,l,c;return"string"!=typeof t?(l=i,i=e,e=t,t=null):l=arguments[3],null==e?e=void 0:s(e)?null==i?i=void 0:s(i)||(l=i,i=void 0):(l=e,e=i=void 0),null==t?(a=!0,h=!1):(a=o.call(t,"c"),h=o.call(t,"e")),c={get:e,set:i,configurable:a,enumerable:h},l?n(r(l),c):c}},function(t,e,i){"use strict";t.exports=i(110)()?Object.assign:i(111)},function(t,e,i){"use strict";t.exports=function(){var t,e=Object.assign;return"function"==typeof e&&(e(t={foo:"raz"},{bar:"dwa"},{trzy:"trzy"}),t.foo+t.bar+t.trzy==="razdwatrzy")}},function(t,e,i){"use strict";var n=i(112),r=i(116),s=Math.max;t.exports=function(t,e){var i,o,a,h=s(arguments.length,2);for(t=Object(r(t)),a=function(n){try{t[n]=e[n]}catch(t){i||(i=t)}},o=1;o<h;++o)n(e=arguments[o]).forEach(a);if(void 0!==i)throw i;return t}},function(t,e,i){"use strict";t.exports=i(113)()?Object.keys:i(114)},function(t,e,i){"use strict";t.exports=function(){try{return Object.keys("primitive"),!0}catch(t){return!1}}},function(t,e,i){"use strict";var n=i(51),r=Object.keys;t.exports=function(t){return r(n(t)?Object(t):t)}},function(t,e,i){"use strict";t.exports=function(){}},function(t,e,i){"use strict";var n=i(51);t.exports=function(t){if(!n(t))throw new TypeError("Cannot use null or undefined");return t}},function(t,e,i){"use strict";var n=i(51),r=Array.prototype.forEach,s=Object.create,o=function(t,e){var i;for(i in t)e[i]=t[i]};t.exports=function(t){var e=s(null);return r.call(arguments,(function(t){n(t)&&o(Object(t),e)})),e}},function(t,e,i){"use strict";t.exports=function(t){return"function"==typeof t}},function(t,e,i){"use strict";t.exports=i(120)()?String.prototype.contains:i(121)},function(t,e,i){"use strict";var n="razdwatrzy";t.exports=function(){return"function"==typeof n.contains&&(!0===n.contains("dwa")&&!1===n.contains("foo"))}},function(t,e,i){"use strict";var n=String.prototype.indexOf;t.exports=function(t){return n.call(this,t,arguments[1])>-1}},function(t,e,i){"use strict";t.exports=function(t){if("function"!=typeof t)throw new TypeError(t+" is not a function");return t}},function(t,e,i){"use strict";var n=i(49).charAt,r=i(26),s=i(74),o=r.set,a=r.getterFor("String Iterator");s(String,"String",(function(t){o(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=a(this),i=e.string,r=e.index;return r>=i.length?{value:void 0,done:!0}:(t=n(i,r),e.index+=t.length,{value:t,done:!1})}))},function(t,e,i){"use strict";var n=i(16),r=i(12),s=i(73),o=i(69),a=i(60),h=i(36),l=i(61),c=Object.assign,u=Object.defineProperty;t.exports=!c||r((function(){if(n&&1!==c({b:1},c(u({},"a",{enumerable:!0,get:function(){u(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},i=Symbol();return t[i]=7,"abcdefghijklmnopqrst".split("").forEach((function(t){e[t]=t})),7!=c({},t)[i]||"abcdefghijklmnopqrst"!=s(c({},e)).join("")}))?function(t,e){for(var i=h(t),r=arguments.length,c=1,u=o.f,d=a.f;r>c;)for(var f,p=l(arguments[c++]),g=u?s(p).concat(u(p)):s(p),v=g.length,m=0;v>m;)f=g[m++],n&&!d.call(p,f)||(i[f]=p[f]);return i}:c},function(t,e,i){"use strict";var n=i(80),r=i(36),s=i(127),o=i(128),a=i(46),h=i(129),l=i(52);t.exports=function(t){var e,i,c,u,d,f,p=r(t),g="function"==typeof this?this:Array,v=arguments.length,m=v>1?arguments[1]:void 0,y=void 0!==m,b=l(p),w=0;if(y&&(m=n(m,v>2?arguments[2]:void 0,2)),null==b||g==Array&&o(b))for(i=new g(e=a(p.length));e>w;w++)f=y?m(p[w],w):p[w],h(i,w,f);else for(d=(u=b.call(p)).next,i=new g;!(c=d.call(u)).done;w++)f=y?s(u,m,[c.value,w],!0):c.value,h(i,w,f);return i.length=w,i}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t}},function(t,e,i){var n=i(13);t.exports=function(t,e,i,r){try{return r?e(n(i)[0],i[1]):e(i)}catch(e){var s=t.return;throw void 0!==s&&n(s.call(t)),e}}},function(t,e,i){var n=i(8),r=i(27),s=n("iterator"),o=Array.prototype;t.exports=function(t){return void 0!==t&&(r.Array===t||o[s]===t)}},function(t,e,i){"use strict";var n=i(41),r=i(18),s=i(25);t.exports=function(t,e,i){var o=n(e);o in t?r.f(t,o,s(0,i)):t[o]=i}},function(t,e,i){var n={};n[i(8)("toStringTag")]="z",t.exports="[object z]"===String(n)},function(t,e,i){"use strict";var n=/[^\0-\u007E]/,r=/[.\u3002\uFF0E\uFF61]/g,s="Overflow: input needs wider integers to process",o=Math.floor,a=String.fromCharCode,h=function(t){return t+22+75*(t<26)},l=function(t,e,i){var n=0;for(t=i?o(t/700):t>>1,t+=o(t/e);t>455;n+=36)t=o(t/35);return o(n+36*t/(t+38))},c=function(t){var e,i,n=[],r=(t=function(t){for(var e=[],i=0,n=t.length;i<n;){var r=t.charCodeAt(i++);if(r>=55296&&r<=56319&&i<n){var s=t.charCodeAt(i++);56320==(64512&s)?e.push(((1023&r)<<10)+(1023&s)+65536):(e.push(r),i--)}else e.push(r)}return e}(t)).length,c=128,u=0,d=72;for(e=0;e<t.length;e++)(i=t[e])<128&&n.push(a(i));var f=n.length,p=f;for(f&&n.push("-");p<r;){var g=2147483647;for(e=0;e<t.length;e++)(i=t[e])>=c&&i<g&&(g=i);var v=p+1;if(g-c>o((2147483647-u)/v))throw RangeError(s);for(u+=(g-c)*v,c=g,e=0;e<t.length;e++){if((i=t[e])<c&&++u>2147483647)throw RangeError(s);if(i==c){for(var m=u,y=36;;y+=36){var b=y<=d?1:y>=d+26?26:y-d;if(m<b)break;var w=m-b,x=36-b;n.push(a(h(b+w%x))),m=o(w/x)}n.push(a(h(m))),d=l(u,v,p==f),u=0,++p}}++u,++c}return n.join("")};t.exports=function(t){var e,i,s=[],o=t.toLowerCase().replace(r,".").split(".");for(e=0;e<o.length;e++)i=o[e],s.push(n.test(i)?"xn--"+c(i):i);return s.join(".")}},function(t,e,i){"use strict";i(71);var n=i(31),r=i(45),s=i(78),o=i(19),a=i(133),h=i(37),l=i(75),c=i(26),u=i(79),d=i(10),f=i(80),p=i(81),g=i(13),v=i(17),m=i(50),y=i(25),b=i(134),w=i(52),x=i(8),E=r("fetch"),S=r("Headers"),_=x("iterator"),O=c.set,C=c.getterFor("URLSearchParams"),T=c.getterFor("URLSearchParamsIterator"),k=/\+/g,R=Array(4),L=function(t){return R[t-1]||(R[t-1]=RegExp("((?:%[\\da-f]{2}){"+t+"})","gi"))},I=function(t){try{return decodeURIComponent(t)}catch(e){return t}},j=function(t){var e=t.replace(k," "),i=4;try{return decodeURIComponent(e)}catch(t){for(;i;)e=e.replace(L(i--),I);return e}},N=/[!'()~]|%20/g,A={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+"},P=function(t){return A[t]},D=function(t){return encodeURIComponent(t).replace(N,P)},z=function(t,e){if(e)for(var i,n,r=e.split("&"),s=0;s<r.length;)(i=r[s++]).length&&(n=i.split("="),t.push({key:j(n.shift()),value:j(n.join("="))}))},B=function(t){this.entries.length=0,z(this.entries,t)},q=function(t,e){if(t<e)throw TypeError("Not enough arguments")},M=l((function(t,e){O(this,{type:"URLSearchParamsIterator",iterator:b(C(t).entries),kind:e})}),"Iterator",(function(){var t=T(this),e=t.kind,i=t.iterator.next(),n=i.value;return i.done||(i.value="keys"===e?n.key:"values"===e?n.value:[n.key,n.value]),i})),U=function(){u(this,U,"URLSearchParams");var t,e,i,n,r,s,o,a,h,l=arguments.length>0?arguments[0]:void 0,c=this,f=[];if(O(c,{type:"URLSearchParams",entries:f,updateURL:function(){},updateSearchParams:B}),void 0!==l)if(v(l))if("function"==typeof(t=w(l)))for(i=(e=t.call(l)).next;!(n=i.call(e)).done;){if((o=(s=(r=b(g(n.value))).next).call(r)).done||(a=s.call(r)).done||!s.call(r).done)throw TypeError("Expected sequence with length 2");f.push({key:o.value+"",value:a.value+""})}else for(h in l)d(l,h)&&f.push({key:h,value:l[h]+""});else z(f,"string"==typeof l?"?"===l.charAt(0)?l.slice(1):l:l+"")},F=U.prototype;a(F,{append:function(t,e){q(arguments.length,2);var i=C(this);i.entries.push({key:t+"",value:e+""}),i.updateURL()},delete:function(t){q(arguments.length,1);for(var e=C(this),i=e.entries,n=t+"",r=0;r<i.length;)i[r].key===n?i.splice(r,1):r++;e.updateURL()},get:function(t){q(arguments.length,1);for(var e=C(this).entries,i=t+"",n=0;n<e.length;n++)if(e[n].key===i)return e[n].value;return null},getAll:function(t){q(arguments.length,1);for(var e=C(this).entries,i=t+"",n=[],r=0;r<e.length;r++)e[r].key===i&&n.push(e[r].value);return n},has:function(t){q(arguments.length,1);for(var e=C(this).entries,i=t+"",n=0;n<e.length;)if(e[n++].key===i)return!0;return!1},set:function(t,e){q(arguments.length,1);for(var i,n=C(this),r=n.entries,s=!1,o=t+"",a=e+"",h=0;h<r.length;h++)(i=r[h]).key===o&&(s?r.splice(h--,1):(s=!0,i.value=a));s||r.push({key:o,value:a}),n.updateURL()},sort:function(){var t,e,i,n=C(this),r=n.entries,s=r.slice();for(r.length=0,i=0;i<s.length;i++){for(t=s[i],e=0;e<i;e++)if(r[e].key>t.key){r.splice(e,0,t);break}e===i&&r.push(t)}n.updateURL()},forEach:function(t){for(var e,i=C(this).entries,n=f(t,arguments.length>1?arguments[1]:void 0,3),r=0;r<i.length;)n((e=i[r++]).value,e.key,this)},keys:function(){return new M(this,"keys")},values:function(){return new M(this,"values")},entries:function(){return new M(this,"entries")}},{enumerable:!0}),o(F,_,F.entries),o(F,"toString",(function(){for(var t,e=C(this).entries,i=[],n=0;n<e.length;)t=e[n++],i.push(D(t.key)+"="+D(t.value));return i.join("&")}),{enumerable:!0}),h(U,"URLSearchParams"),n({global:!0,forced:!s},{URLSearchParams:U}),s||"function"!=typeof E||"function"!=typeof S||n({global:!0,enumerable:!0,forced:!0},{fetch:function(t){var e,i,n,r=[t];return arguments.length>1&&(v(e=arguments[1])&&(i=e.body,"URLSearchParams"===p(i)&&((n=e.headers?new S(e.headers):new S).has("content-type")||n.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"),e=m(e,{body:y(0,String(i)),headers:y(0,n)}))),r.push(e)),E.apply(this,r)}}),t.exports={URLSearchParams:U,getState:C}},function(t,e,i){var n=i(19);t.exports=function(t,e,i){for(var r in e)n(t,r,e[r],i);return t}},function(t,e,i){var n=i(13),r=i(52);t.exports=function(t){var e=r(t);if("function"!=typeof e)throw TypeError(String(t)+" is not iterable");return n(e.call(t))}},function(t,e,i){"use strict";function n(t){return document.createElementNS("http://www.w3.org/2000/svg",t)}Object.defineProperty(e,"__esModule",{value:!0}),e.createElement=n,e.default={createElement:n}},function(t,e,i){"use strict";function n(t,e){function i(i){for(var n=e.length-1;n>=0;n--){var o=e[n],a=i.clientX,h=i.clientY;if(i.touches&&i.touches.length&&(a=i.touches[0].clientX,h=i.touches[0].clientY),s(o,t,a,h)){o.dispatchEvent(r(i));break}}}if("iframe"===t.nodeName||"IFRAME"===t.nodeName)try{this.target=t.contentDocument}catch(e){this.target=t}else this.target=t;for(var n=["mouseup","mousedown","click","touchstart"],o=0;o<n.length;o++){var a=n[o];this.target.addEventListener(a,(function(t){return i(t)}),!1)}}function r(t){var e=Object.assign({},t,{bubbles:!1});try{return new MouseEvent(t.type,e)}catch(n){var i=document.createEvent("MouseEvents");return i.initMouseEvent(t.type,!1,e.cancelable,e.view,e.detail,e.screenX,e.screenY,e.clientX,e.clientY,e.ctrlKey,e.altKey,e.shiftKey,e.metaKey,e.button,e.relatedTarget),i}}function s(t,e,i,n){var r=e.getBoundingClientRect();function s(t,e,i){var n=t.top-r.top,s=t.left-r.left,o=n+t.height,a=s+t.width;return n<=i&&s<=e&&o>i&&a>e}if(!s(t.getBoundingClientRect(),i,n))return!1;for(var o=t.getClientRects(),a=0,h=o.length;a<h;a++)if(s(o[a],i,n))return!0;return!1}Object.defineProperty(e,"__esModule",{value:!0}),e.proxyMouse=n,e.clone=r,e.default={proxyMouse:n}},function(t,e,i){var n=i(82);t.exports=function(){return n.Date.now()}},function(t,e,i){(function(e){var i="object"==typeof e&&e&&e.Object===Object&&e;t.exports=i}).call(this,i(30))},function(t,e,i){var n=i(53),r=i(140),s=/^\s+|\s+$/g,o=/^[-+]0x[0-9a-f]+$/i,a=/^0b[01]+$/i,h=/^0o[0-7]+$/i,l=parseInt;t.exports=function(t){if("number"==typeof t)return t;if(r(t))return NaN;if(n(t)){var e="function"==typeof t.valueOf?t.valueOf():t;t=n(e)?e+"":e}if("string"!=typeof t)return 0===t?t:+t;t=t.replace(s,"");var i=a.test(t);return i||h.test(t)?l(t.slice(2),i?2:8):o.test(t)?NaN:+t}},function(t,e,i){var n=i(141),r=i(144);t.exports=function(t){return"symbol"==typeof t||r(t)&&"[object Symbol]"==n(t)}},function(t,e,i){var n=i(83),r=i(142),s=i(143),o=n?n.toStringTag:void 0;t.exports=function(t){return null==t?void 0===t?"[object Undefined]":"[object Null]":o&&o in Object(t)?r(t):s(t)}},function(t,e,i){var n=i(83),r=Object.prototype,s=r.hasOwnProperty,o=r.toString,a=n?n.toStringTag:void 0;t.exports=function(t){var e=s.call(t,a),i=t[a];try{t[a]=void 0;var n=!0}catch(t){}var r=o.call(t);return n&&(e?t[a]=i:delete t[a]),r}},function(t,e){var i=Object.prototype.toString;t.exports=function(t){return i.call(t)}},function(t,e){t.exports=function(t){return null!=t&&"object"==typeof t}}]).default}));
\ No newline at end of file
diff --git a/cps/static/js/libs/jszip.min.js b/cps/static/js/libs/jszip.min.js
index 366b0a03..bf7739ab 100644
--- a/cps/static/js/libs/jszip.min.js
+++ b/cps/static/js/libs/jszip.min.js
@@ -1,6 +1,6 @@
 /*!
 
-JSZip v3.1.5 - A JavaScript class for generating and reading zip files
+JSZip v3.5.0 - A JavaScript class for generating and reading zip files
 <http://stuartk.com/jszip>
 
 (c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
@@ -9,7 +9,5 @@ Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/js
 JSZip uses the library pako released under the MIT license :
 https://github.com/nodeca/pako/blob/master/LICENSE
 */
-!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d=a("./utils"),e=a("./support"),f="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,g,h,i,j,k=[],l=0,m=a.length,n=m,o="string"!==d.getTypeOf(a);l<a.length;)n=m-l,o?(b=a[l++],c=l<m?a[l++]:0,e=l<m?a[l++]:0):(b=a.charCodeAt(l++),c=l<m?a.charCodeAt(l++):0,e=l<m?a.charCodeAt(l++):0),g=b>>2,h=(3&b)<<4|c>>4,i=n>1?(15&c)<<2|e>>6:64,j=n>2?63&e:64,k.push(f.charAt(g)+f.charAt(h)+f.charAt(i)+f.charAt(j));return k.join("")},c.decode=function(a){var b,c,d,g,h,i,j,k=0,l=0,m="data:";if(a.substr(0,m.length)===m)throw new Error("Invalid base64 input, it looks like a data url.");a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");var n=3*a.length/4;if(a.charAt(a.length-1)===f.charAt(64)&&n--,a.charAt(a.length-2)===f.charAt(64)&&n--,n%1!==0)throw new Error("Invalid base64 input, bad content length.");var o;for(o=e.uint8array?new Uint8Array(0|n):new Array(0|n);k<a.length;)g=f.indexOf(a.charAt(k++)),h=f.indexOf(a.charAt(k++)),i=f.indexOf(a.charAt(k++)),j=f.indexOf(a.charAt(k++)),b=g<<2|h>>4,c=(15&h)<<4|i>>2,d=(3&i)<<6|j,o[l++]=b,64!==i&&(o[l++]=c),64!==j&&(o[l++]=d);return o}},{"./support":30,"./utils":32}],2:[function(a,b,c){"use strict";function d(a,b,c,d,e){this.compressedSize=a,this.uncompressedSize=b,this.crc32=c,this.compression=d,this.compressedContent=e}var e=a("./external"),f=a("./stream/DataWorker"),g=a("./stream/DataLengthProbe"),h=a("./stream/Crc32Probe"),g=a("./stream/DataLengthProbe");d.prototype={getContentWorker:function(){var a=new f(e.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new g("data_length")),b=this;return a.on("end",function(){if(this.streamInfo.data_length!==b.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),a},getCompressedWorker:function(){return new f(e.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},d.createWorkerFrom=function(a,b,c){return a.pipe(new h).pipe(new g("uncompressedSize")).pipe(b.compressWorker(c)).pipe(new g("compressedSize")).withStreamInfo("compression",b)},b.exports=d},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(a,b,c){"use strict";var d=a("./stream/GenericWorker");c.STORE={magic:"\0\0",compressWorker:function(a){return new d("STORE compression")},uncompressWorker:function(){return new d("STORE decompression")}},c.DEFLATE=a("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(a,b,c){"use strict";function d(){for(var a,b=[],c=0;c<256;c++){a=c;for(var d=0;d<8;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function e(a,b,c,d){var e=h,f=d+c;a^=-1;for(var g=d;g<f;g++)a=a>>>8^e[255&(a^b[g])];return a^-1}function f(a,b,c,d){var e=h,f=d+c;a^=-1;for(var g=d;g<f;g++)a=a>>>8^e[255&(a^b.charCodeAt(g))];return a^-1}var g=a("./utils"),h=d();b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var c="string"!==g.getTypeOf(a);return c?e(0|b,a,a.length,0):f(0|b,a,a.length,0)}},{"./utils":32}],5:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!0,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],6:[function(a,b,c){"use strict";var d=null;d="undefined"!=typeof Promise?Promise:a("lie"),b.exports={Promise:d}},{lie:58}],7:[function(a,b,c){"use strict";function d(a,b){h.call(this,"FlateWorker/"+a),this._pako=null,this._pakoAction=a,this._pakoOptions=b,this.meta={}}var e="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,f=a("pako"),g=a("./utils"),h=a("./stream/GenericWorker"),i=e?"uint8array":"array";c.magic="\b\0",g.inherits(d,h),d.prototype.processChunk=function(a){this.meta=a.meta,null===this._pako&&this._createPako(),this._pako.push(g.transformTo(i,a.data),!1)},d.prototype.flush=function(){h.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},d.prototype.cleanUp=function(){h.prototype.cleanUp.call(this),this._pako=null},d.prototype._createPako=function(){this._pako=new f[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var a=this;this._pako.onData=function(b){a.push({data:b,meta:a.meta})}},c.compressWorker=function(a){return new d("Deflate",a)},c.uncompressWorker=function(){return new d("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:59}],8:[function(a,b,c){"use strict";function d(a,b,c,d){f.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=b,this.zipPlatform=c,this.encodeFileName=d,this.streamFiles=a,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}var e=a("../utils"),f=a("../stream/GenericWorker"),g=a("../utf8"),h=a("../crc32"),i=a("../signature"),j=function(a,b){var c,d="";for(c=0;c<b;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},k=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},l=function(a,b){return 63&(a||0)},m=function(a,b,c,d,f,m){var n,o,p=a.file,q=a.compression,r=m!==g.utf8encode,s=e.transformTo("string",m(p.name)),t=e.transformTo("string",g.utf8encode(p.name)),u=p.comment,v=e.transformTo("string",m(u)),w=e.transformTo("string",g.utf8encode(u)),x=t.length!==p.name.length,y=w.length!==u.length,z="",A="",B="",C=p.dir,D=p.date,E={crc32:0,compressedSize:0,uncompressedSize:0};b&&!c||(E.crc32=a.crc32,E.compressedSize=a.compressedSize,E.uncompressedSize=a.uncompressedSize);var F=0;b&&(F|=8),r||!x&&!y||(F|=2048);var G=0,H=0;C&&(G|=16),"UNIX"===f?(H=798,G|=k(p.unixPermissions,C)):(H=20,G|=l(p.dosPermissions,C)),n=D.getUTCHours(),n<<=6,n|=D.getUTCMinutes(),n<<=5,n|=D.getUTCSeconds()/2,o=D.getUTCFullYear()-1980,o<<=4,o|=D.getUTCMonth()+1,o<<=5,o|=D.getUTCDate(),x&&(A=j(1,1)+j(h(s),4)+t,z+="up"+j(A.length,2)+A),y&&(B=j(1,1)+j(h(v),4)+w,z+="uc"+j(B.length,2)+B);var I="";I+="\n\0",I+=j(F,2),I+=q.magic,I+=j(n,2),I+=j(o,2),I+=j(E.crc32,4),I+=j(E.compressedSize,4),I+=j(E.uncompressedSize,4),I+=j(s.length,2),I+=j(z.length,2);var J=i.LOCAL_FILE_HEADER+I+s+z,K=i.CENTRAL_FILE_HEADER+j(H,2)+I+j(v.length,2)+"\0\0\0\0"+j(G,4)+j(d,4)+s+z+v;return{fileRecord:J,dirRecord:K}},n=function(a,b,c,d,f){var g="",h=e.transformTo("string",f(d));return g=i.CENTRAL_DIRECTORY_END+"\0\0\0\0"+j(a,2)+j(a,2)+j(b,4)+j(c,4)+j(h.length,2)+h},o=function(a){var b="";return b=i.DATA_DESCRIPTOR+j(a.crc32,4)+j(a.compressedSize,4)+j(a.uncompressedSize,4)};e.inherits(d,f),d.prototype.push=function(a){var b=a.meta.percent||0,c=this.entriesCount,d=this._sources.length;this.accumulate?this.contentBuffer.push(a):(this.bytesWritten+=a.data.length,f.prototype.push.call(this,{data:a.data,meta:{currentFile:this.currentFile,percent:c?(b+100*(c-d-1))/c:100}}))},d.prototype.openedSource=function(a){this.currentSourceOffset=this.bytesWritten,this.currentFile=a.file.name;var b=this.streamFiles&&!a.file.dir;if(b){var c=m(a,b,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:c.fileRecord,meta:{percent:0}})}else this.accumulate=!0},d.prototype.closedSource=function(a){this.accumulate=!1;var b=this.streamFiles&&!a.file.dir,c=m(a,b,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(c.dirRecord),b)this.push({data:o(a),meta:{percent:100}});else for(this.push({data:c.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},d.prototype.flush=function(){for(var a=this.bytesWritten,b=0;b<this.dirRecords.length;b++)this.push({data:this.dirRecords[b],meta:{percent:100}});var c=this.bytesWritten-a,d=n(this.dirRecords.length,c,a,this.zipComment,this.encodeFileName);this.push({data:d,meta:{percent:100}})},d.prototype.prepareNextSource=function(){this.previous=this._sources.shift(),this.openedSource(this.previous.streamInfo),this.isPaused?this.previous.pause():this.previous.resume()},d.prototype.registerPrevious=function(a){this._sources.push(a);var b=this;return a.on("data",function(a){b.processChunk(a)}),a.on("end",function(){b.closedSource(b.previous.streamInfo),b._sources.length?b.prepareNextSource():b.end()}),a.on("error",function(a){b.error(a)}),this},d.prototype.resume=function(){return!!f.prototype.resume.call(this)&&(!this.previous&&this._sources.length?(this.prepareNextSource(),!0):this.previous||this._sources.length||this.generatedError?void 0:(this.end(),!0))},d.prototype.error=function(a){var b=this._sources;if(!f.prototype.error.call(this,a))return!1;for(var c=0;c<b.length;c++)try{b[c].error(a)}catch(a){}return!0},d.prototype.lock=function(){f.prototype.lock.call(this);for(var a=this._sources,b=0;b<a.length;b++)a[b].lock()},b.exports=d},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(a,b,c){"use strict";var d=a("../compressions"),e=a("./ZipFileWorker"),f=function(a,b){var c=a||b,e=d[c];if(!e)throw new Error(c+" is not a valid compression method !");return e};c.generateWorker=function(a,b,c){var d=new e(b.streamFiles,c,b.platform,b.encodeFileName),g=0;try{a.forEach(function(a,c){g++;var e=f(c.options.compression,b.compression),h=c.options.compressionOptions||b.compressionOptions||{},i=c.dir,j=c.date;c._compressWorker(e,h).withStreamInfo("file",{name:a,dir:i,date:j,comment:c.comment||"",unixPermissions:c.unixPermissions,dosPermissions:c.dosPermissions}).pipe(d)}),d.entriesCount=g}catch(h){d.error(h)}return d}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(a,b,c){"use strict";function d(){if(!(this instanceof d))return new d;if(arguments.length)throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");this.files={},this.comment=null,this.root="",this.clone=function(){var a=new d;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a}}d.prototype=a("./object"),d.prototype.loadAsync=a("./load"),d.support=a("./support"),d.defaults=a("./defaults"),d.version="3.1.5",d.loadAsync=function(a,b){return(new d).loadAsync(a,b)},d.external=a("./external"),b.exports=d},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(a,b,c){"use strict";function d(a){return new f.Promise(function(b,c){var d=a.decompressed.getContentWorker().pipe(new i);d.on("error",function(a){c(a)}).on("end",function(){d.streamInfo.crc32!==a.decompressed.crc32?c(new Error("Corrupted zip : CRC32 mismatch")):b()}).resume()})}var e=a("./utils"),f=a("./external"),g=a("./utf8"),e=a("./utils"),h=a("./zipEntries"),i=a("./stream/Crc32Probe"),j=a("./nodejsUtils");b.exports=function(a,b){var c=this;return b=e.extend(b||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:g.utf8decode}),j.isNode&&j.isStream(a)?f.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):e.prepareContent("the loaded zip file",a,!0,b.optimizedBinaryString,b.base64).then(function(a){var c=new h(b);return c.load(a),c}).then(function(a){var c=[f.Promise.resolve(a)],e=a.files;if(b.checkCRC32)for(var g=0;g<e.length;g++)c.push(d(e[g]));return f.Promise.all(c)}).then(function(a){for(var d=a.shift(),e=d.files,f=0;f<e.length;f++){var g=e[f];c.file(g.fileNameStr,g.decompressed,{binary:!0,optimizedBinaryString:!0,date:g.date,dir:g.dir,comment:g.fileCommentStr.length?g.fileCommentStr:null,unixPermissions:g.unixPermissions,dosPermissions:g.dosPermissions,createFolders:b.createFolders})}return d.zipComment.length&&(c.comment=d.zipComment),c})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(a,b,c){"use strict";function d(a,b){f.call(this,"Nodejs stream input adapter for "+a),this._upstreamEnded=!1,this._bindStream(b)}var e=a("../utils"),f=a("../stream/GenericWorker");e.inherits(d,f),d.prototype._bindStream=function(a){var b=this;this._stream=a,a.pause(),a.on("data",function(a){b.push({data:a,meta:{percent:0}})}).on("error",function(a){b.isPaused?this.generatedError=a:b.error(a)}).on("end",function(){b.isPaused?b._upstreamEnded=!0:b.end()})},d.prototype.pause=function(){return!!f.prototype.pause.call(this)&&(this._stream.pause(),!0)},d.prototype.resume=function(){return!!f.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},b.exports=d},{"../stream/GenericWorker":28,"../utils":32}],13:[function(a,b,c){"use strict";function d(a,b,c){e.call(this,b),this._helper=a;var d=this;a.on("data",function(a,b){d.push(a)||d._helper.pause(),c&&c(b)}).on("error",function(a){d.emit("error",a)}).on("end",function(){d.push(null)})}var e=a("readable-stream").Readable,f=a("../utils");f.inherits(d,e),d.prototype._read=function(){this._helper.resume()},b.exports=d},{"../utils":32,"readable-stream":16}],14:[function(a,b,c){"use strict";b.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(a,b){return new Buffer(a,b)},allocBuffer:function(a){return Buffer.alloc?Buffer.alloc(a):new Buffer(a)},isBuffer:function(a){return Buffer.isBuffer(a)},isStream:function(a){return a&&"function"==typeof a.on&&"function"==typeof a.pause&&"function"==typeof a.resume}}},{}],15:[function(a,b,c){"use strict";function d(a){return"[object RegExp]"===Object.prototype.toString.call(a)}var e=a("./utf8"),f=a("./utils"),g=a("./stream/GenericWorker"),h=a("./stream/StreamHelper"),i=a("./defaults"),j=a("./compressedObject"),k=a("./zipObject"),l=a("./generate"),m=a("./nodejsUtils"),n=a("./nodejs/NodejsStreamInputAdapter"),o=function(a,b,c){var d,e=f.getTypeOf(b),h=f.extend(c||{},i);h.date=h.date||new Date,null!==h.compression&&(h.compression=h.compression.toUpperCase()),"string"==typeof h.unixPermissions&&(h.unixPermissions=parseInt(h.unixPermissions,8)),h.unixPermissions&&16384&h.unixPermissions&&(h.dir=!0),h.dosPermissions&&16&h.dosPermissions&&(h.dir=!0),h.dir&&(a=q(a)),h.createFolders&&(d=p(a))&&r.call(this,d,!0);var l="string"===e&&h.binary===!1&&h.base64===!1;c&&"undefined"!=typeof c.binary||(h.binary=!l);var o=b instanceof j&&0===b.uncompressedSize;(o||h.dir||!b||0===b.length)&&(h.base64=!1,h.binary=!0,b="",h.compression="STORE",e="string");var s=null;s=b instanceof j||b instanceof g?b:m.isNode&&m.isStream(b)?new n(a,b):f.prepareContent(a,b,h.binary,h.optimizedBinaryString,h.base64);var t=new k(a,s,h);this.files[a]=t},p=function(a){"/"===a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},q=function(a){return"/"!==a.slice(-1)&&(a+="/"),a},r=function(a,b){return b="undefined"!=typeof b?b:i.createFolders,a=q(a),this.files[a]||o.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},s={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(a){var b,c,d;for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],c=b.slice(this.root.length,b.length),c&&b.slice(0,this.root.length)===this.root&&a(c,d))},filter:function(a){var b=[];return this.forEach(function(c,d){a(c,d)&&b.push(d)}),b},file:function(a,b,c){if(1===arguments.length){if(d(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}var f=this.files[this.root+a];return f&&!f.dir?f:null}return a=this.root+a,o.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=r.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!==a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(a){var b,c={};try{if(c=f.extend(a||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:e.utf8encode}),c.type=c.type.toLowerCase(),c.compression=c.compression.toUpperCase(),"binarystring"===c.type&&(c.type="string"),!c.type)throw new Error("No output type specified.");f.checkSupport(c.type),"darwin"!==c.platform&&"freebsd"!==c.platform&&"linux"!==c.platform&&"sunos"!==c.platform||(c.platform="UNIX"),"win32"===c.platform&&(c.platform="DOS");var d=c.comment||this.comment||"";b=l.generateWorker(this,c,d)}catch(i){b=new g("error"),b.error(i)}return new h(b,c.type||"string",c.mimeType)},generateAsync:function(a,b){return this.generateInternalStream(a).accumulate(b)},generateNodeStream:function(a,b){return a=a||{},a.type||(a.type="nodebuffer"),this.generateInternalStream(a).toNodejsStream(b)}};b.exports=s},{"./compressedObject":2,"./defaults":5,"./generate":9,"./nodejs/NodejsStreamInputAdapter":12,"./nodejsUtils":14,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31,"./utils":32,"./zipObject":35}],16:[function(a,b,c){b.exports=a("stream")},{stream:void 0}],17:[function(a,b,c){"use strict";function d(a){e.call(this,a);for(var b=0;b<this.data.length;b++)a[b]=255&a[b]}var e=a("./DataReader"),f=a("../utils");f.inherits(d,e),d.prototype.byteAt=function(a){return this.data[this.zero+a]},d.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f-this.zero;return-1},d.prototype.readAndCheckSignature=function(a){var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.readData(4);return b===f[0]&&c===f[1]&&d===f[2]&&e===f[3]},d.prototype.readData=function(a){if(this.checkOffset(a),0===a)return[];var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./DataReader":18}],18:[function(a,b,c){"use strict";function d(a){this.data=a,this.length=a.length,this.index=0,this.zero=0}var e=a("../utils");d.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<this.zero+a||a<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(a){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return e.transformTo("string",this.readData(a))},readData:function(a){},lastIndexOfSignature:function(a){},readAndCheckSignature:function(a){},readDate:function(){var a=this.readInt(4);return new Date(Date.UTC((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1))}},b.exports=d},{"../utils":32}],19:[function(a,b,c){"use strict";function d(a){e.call(this,a)}var e=a("./Uint8ArrayReader"),f=a("../utils");f.inherits(d,e),d.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(a,b,c){"use strict";function d(a){e.call(this,a)}var e=a("./DataReader"),f=a("../utils");f.inherits(d,e),d.prototype.byteAt=function(a){return this.data.charCodeAt(this.zero+a)},d.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)-this.zero},d.prototype.readAndCheckSignature=function(a){var b=this.readData(4);return a===b},d.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./DataReader":18}],21:[function(a,b,c){"use strict";function d(a){e.call(this,a)}var e=a("./ArrayReader"),f=a("../utils");f.inherits(d,e),d.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"../utils":32,"./ArrayReader":17}],22:[function(a,b,c){"use strict";var d=a("../utils"),e=a("../support"),f=a("./ArrayReader"),g=a("./StringReader"),h=a("./NodeBufferReader"),i=a("./Uint8ArrayReader");b.exports=function(a){var b=d.getTypeOf(a);return d.checkSupport(b),"string"!==b||e.uint8array?"nodebuffer"===b?new h(a):e.uint8array?new i(d.transformTo("uint8array",a)):new f(d.transformTo("array",a)):new g(a)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],24:[function(a,b,c){"use strict";function d(a){e.call(this,"ConvertWorker to "+a),this.destType=a}var e=a("./GenericWorker"),f=a("../utils");f.inherits(d,e),d.prototype.processChunk=function(a){this.push({data:f.transformTo(this.destType,a.data),meta:a.meta})},b.exports=d},{"../utils":32,"./GenericWorker":28}],25:[function(a,b,c){"use strict";function d(){e.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}var e=a("./GenericWorker"),f=a("../crc32"),g=a("../utils");g.inherits(d,e),d.prototype.processChunk=function(a){this.streamInfo.crc32=f(a.data,this.streamInfo.crc32||0),this.push(a)},b.exports=d},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(a,b,c){"use strict";function d(a){f.call(this,"DataLengthProbe for "+a),this.propName=a,this.withStreamInfo(a,0)}var e=a("../utils"),f=a("./GenericWorker");e.inherits(d,f),d.prototype.processChunk=function(a){if(a){var b=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=b+a.data.length}f.prototype.processChunk.call(this,a)},b.exports=d},{"../utils":32,"./GenericWorker":28}],27:[function(a,b,c){"use strict";function d(a){f.call(this,"DataWorker");var b=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,a.then(function(a){b.dataIsReady=!0,b.data=a,b.max=a&&a.length||0,b.type=e.getTypeOf(a),b.isPaused||b._tickAndRepeat()},function(a){b.error(a)})}var e=a("../utils"),f=a("./GenericWorker"),g=16384;e.inherits(d,f),d.prototype.cleanUp=function(){f.prototype.cleanUp.call(this),this.data=null},d.prototype.resume=function(){return!!f.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,e.delay(this._tickAndRepeat,[],this)),!0)},d.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(e.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},d.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var a=g,b=null,c=Math.min(this.max,this.index+a);if(this.index>=this.max)return this.end();switch(this.type){case"string":b=this.data.substring(this.index,c);break;case"uint8array":b=this.data.subarray(this.index,c);break;case"array":case"nodebuffer":b=this.data.slice(this.index,c)}return this.index=c,this.push({data:b,meta:{percent:this.max?this.index/this.max*100:0}})},b.exports=d},{"../utils":32,"./GenericWorker":28}],28:[function(a,b,c){"use strict";function d(a){this.name=a||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}d.prototype={push:function(a){this.emit("data",a)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(a){this.emit("error",a)}return!0},error:function(a){return!this.isFinished&&(this.isPaused?this.generatedError=a:(this.isFinished=!0,this.emit("error",a),this.previous&&this.previous.error(a),this.cleanUp()),!0)},on:function(a,b){return this._listeners[a].push(b),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(a,b){if(this._listeners[a])for(var c=0;c<this._listeners[a].length;c++)this._listeners[a][c].call(this,b)},pipe:function(a){return a.registerPrevious(this)},registerPrevious:function(a){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=a.streamInfo,this.mergeStreamInfo(),this.previous=a;var b=this;return a.on("data",function(a){b.processChunk(a)}),a.on("end",function(){b.end()}),a.on("error",function(a){b.error(a)}),this},pause:function(){return!this.isPaused&&!this.isFinished&&(this.isPaused=!0,this.previous&&this.previous.pause(),!0)},resume:function(){if(!this.isPaused||this.isFinished)return!1;this.isPaused=!1;var a=!1;return this.generatedError&&(this.error(this.generatedError),a=!0),this.previous&&this.previous.resume(),!a},flush:function(){},processChunk:function(a){this.push(a)},withStreamInfo:function(a,b){return this.extraStreamInfo[a]=b,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var a in this.extraStreamInfo)this.extraStreamInfo.hasOwnProperty(a)&&(this.streamInfo[a]=this.extraStreamInfo[a])},lock:function(){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.isLocked=!0,this.previous&&this.previous.lock()},toString:function(){var a="Worker "+this.name;return this.previous?this.previous+" -> "+a:a}},b.exports=d},{}],29:[function(a,b,c){"use strict";function d(a,b,c){switch(a){case"blob":return h.newBlob(h.transformTo("arraybuffer",b),c);case"base64":return k.encode(b);default:return h.transformTo(a,b)}}function e(a,b){var c,d=0,e=null,f=0;for(c=0;c<b.length;c++)f+=b[c].length;switch(a){case"string":return b.join("");case"array":return Array.prototype.concat.apply([],b);case"uint8array":for(e=new Uint8Array(f),c=0;c<b.length;c++)e.set(b[c],d),d+=b[c].length;return e;case"nodebuffer":return Buffer.concat(b);default:throw new Error("concat : unsupported type '"+a+"'")}}function f(a,b){return new m.Promise(function(c,f){var g=[],h=a._internalType,i=a._outputType,j=a._mimeType;a.on("data",function(a,c){g.push(a),b&&b(c)}).on("error",function(a){g=[],f(a)}).on("end",function(){try{var a=d(i,e(h,g),j);c(a)}catch(b){f(b)}g=[]}).resume()})}function g(a,b,c){var d=b;switch(b){case"blob":case"arraybuffer":d="uint8array";break;case"base64":d="string"}try{this._internalType=d,this._outputType=b,this._mimeType=c,h.checkSupport(d),this._worker=a.pipe(new i(d)),a.lock()}catch(e){this._worker=new j("error"),this._worker.error(e)}}var h=a("../utils"),i=a("./ConvertWorker"),j=a("./GenericWorker"),k=a("../base64"),l=a("../support"),m=a("../external"),n=null;if(l.nodestream)try{n=a("../nodejs/NodejsStreamOutputAdapter")}catch(o){}g.prototype={accumulate:function(a){return f(this,a)},on:function(a,b){var c=this;return"data"===a?this._worker.on(a,function(a){b.call(c,a.data,a.meta)}):this._worker.on(a,function(){h.delay(b,arguments,c)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(a){if(h.checkSupport("nodestream"),"nodebuffer"!==this._outputType)throw new Error(this._outputType+" is not supported by this method");return new n(this,{objectMode:"nodebuffer"!==this._outputType},a)}},b.exports=g},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(a,b,c){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof Buffer,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var d=new ArrayBuffer(0);try{c.blob=0===new Blob([d],{type:"application/zip"}).size}catch(e){try{var f=self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder,g=new f;g.append(d),c.blob=0===g.getBlob("application/zip").size}catch(e){c.blob=!1}}}try{c.nodestream=!!a("readable-stream").Readable}catch(e){c.nodestream=!1}},{"readable-stream":16}],31:[function(a,b,c){"use strict";function d(){i.call(this,"utf-8 decode"),this.leftOver=null}function e(){i.call(this,"utf-8 encode")}for(var f=a("./utils"),g=a("./support"),h=a("./nodejsUtils"),i=a("./stream/GenericWorker"),j=new Array(256),k=0;k<256;k++)j[k]=k>=252?6:k>=248?5:k>=240?4:k>=224?3:k>=192?2:1;j[254]=j[254]=1;var l=function(a){var b,c,d,e,f,h=a.length,i=0;for(e=0;e<h;e++)c=a.charCodeAt(e),55296===(64512&c)&&e+1<h&&(d=a.charCodeAt(e+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),e++)),i+=c<128?1:c<2048?2:c<65536?3:4;for(b=g.uint8array?new Uint8Array(i):new Array(i),f=0,e=0;f<i;e++)c=a.charCodeAt(e),55296===(64512&c)&&e+1<h&&(d=a.charCodeAt(e+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),e++)),c<128?b[f++]=c:c<2048?(b[f++]=192|c>>>6,b[f++]=128|63&c):c<65536?(b[f++]=224|c>>>12,b[f++]=128|c>>>6&63,b[f++]=128|63&c):(b[f++]=240|c>>>18,b[f++]=128|c>>>12&63,b[f++]=128|c>>>6&63,b[f++]=128|63&c);return b},m=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return c<0?b:0===c?b:c+j[a[c]]>b?c:b},n=function(a){var b,c,d,e,g=a.length,h=new Array(2*g);for(c=0,b=0;b<g;)if(d=a[b++],d<128)h[c++]=d;else if(e=j[d],e>4)h[c++]=65533,b+=e-1;else{for(d&=2===e?31:3===e?15:7;e>1&&b<g;)d=d<<6|63&a[b++],e--;e>1?h[c++]=65533:d<65536?h[c++]=d:(d-=65536,h[c++]=55296|d>>10&1023,h[c++]=56320|1023&d)}return h.length!==c&&(h.subarray?h=h.subarray(0,c):h.length=c),f.applyFromCharCode(h)};c.utf8encode=function(a){return g.nodebuffer?h.newBufferFrom(a,"utf-8"):l(a)},c.utf8decode=function(a){return g.nodebuffer?f.transformTo("nodebuffer",a).toString("utf-8"):(a=f.transformTo(g.uint8array?"uint8array":"array",a),n(a))},f.inherits(d,i),d.prototype.processChunk=function(a){var b=f.transformTo(g.uint8array?"uint8array":"array",a.data);if(this.leftOver&&this.leftOver.length){if(g.uint8array){var d=b;b=new Uint8Array(d.length+this.leftOver.length),b.set(this.leftOver,0),b.set(d,this.leftOver.length)}else b=this.leftOver.concat(b);this.leftOver=null}var e=m(b),h=b;e!==b.length&&(g.uint8array?(h=b.subarray(0,e),this.leftOver=b.subarray(e,b.length)):(h=b.slice(0,e),this.leftOver=b.slice(e,b.length))),this.push({data:c.utf8decode(h),meta:a.meta})},d.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:c.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},c.Utf8DecodeWorker=d,f.inherits(e,i),e.prototype.processChunk=function(a){this.push({data:c.utf8encode(a.data),meta:a.meta})},c.Utf8EncodeWorker=e},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(a,b,c){"use strict";function d(a){var b=null;return b=i.uint8array?new Uint8Array(a.length):new Array(a.length),f(a,b)}function e(a){return a}function f(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function g(a){var b=65536,d=c.getTypeOf(a),e=!0;if("uint8array"===d?e=n.applyCanBeUsed.uint8array:"nodebuffer"===d&&(e=n.applyCanBeUsed.nodebuffer),e)for(;b>1;)try{return n.stringifyByChunk(a,d,b)}catch(f){b=Math.floor(b/2)}return n.stringifyByChar(a)}function h(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];
-return b}var i=a("./support"),j=a("./base64"),k=a("./nodejsUtils"),l=a("core-js/library/fn/set-immediate"),m=a("./external");c.newBlob=function(a,b){c.checkSupport("blob");try{return new Blob([a],{type:b})}catch(d){try{var e=self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder,f=new e;return f.append(a),f.getBlob(b)}catch(d){throw new Error("Bug : can't construct the Blob.")}}};var n={stringifyByChunk:function(a,b,c){var d=[],e=0,f=a.length;if(f<=c)return String.fromCharCode.apply(null,a);for(;e<f;)"array"===b||"nodebuffer"===b?d.push(String.fromCharCode.apply(null,a.slice(e,Math.min(e+c,f)))):d.push(String.fromCharCode.apply(null,a.subarray(e,Math.min(e+c,f)))),e+=c;return d.join("")},stringifyByChar:function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(a[c]);return b},applyCanBeUsed:{uint8array:function(){try{return i.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(a){return!1}}(),nodebuffer:function(){try{return i.nodebuffer&&1===String.fromCharCode.apply(null,k.allocBuffer(1)).length}catch(a){return!1}}()}};c.applyFromCharCode=g;var o={};o.string={string:e,array:function(a){return f(a,new Array(a.length))},arraybuffer:function(a){return o.string.uint8array(a).buffer},uint8array:function(a){return f(a,new Uint8Array(a.length))},nodebuffer:function(a){return f(a,k.allocBuffer(a.length))}},o.array={string:g,array:e,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return k.newBufferFrom(a)}},o.arraybuffer={string:function(a){return g(new Uint8Array(a))},array:function(a){return h(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:e,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return k.newBufferFrom(new Uint8Array(a))}},o.uint8array={string:g,array:function(a){return h(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:e,nodebuffer:function(a){return k.newBufferFrom(a)}},o.nodebuffer={string:g,array:function(a){return h(a,new Array(a.length))},arraybuffer:function(a){return o.nodebuffer.uint8array(a).buffer},uint8array:function(a){return h(a,new Uint8Array(a.length))},nodebuffer:e},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=o[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":i.nodebuffer&&k.isBuffer(a)?"nodebuffer":i.uint8array&&a instanceof Uint8Array?"uint8array":i.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=i[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this platform")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(b<16?"0":"")+b.toString(16).toUpperCase();return d},c.delay=function(a,b,c){l(function(){a.apply(c||null,b||[])})},c.inherits=function(a,b){var c=function(){};c.prototype=b.prototype,a.prototype=new c},c.extend=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},c.prepareContent=function(a,b,e,f,g){var h=m.Promise.resolve(b).then(function(a){var b=i.blob&&(a instanceof Blob||["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(a))!==-1);return b&&"undefined"!=typeof FileReader?new m.Promise(function(b,c){var d=new FileReader;d.onload=function(a){b(a.target.result)},d.onerror=function(a){c(a.target.error)},d.readAsArrayBuffer(a)}):a});return h.then(function(b){var h=c.getTypeOf(b);return h?("arraybuffer"===h?b=c.transformTo("uint8array",b):"string"===h&&(g?b=j.decode(b):e&&f!==!0&&(b=d(b))),b):m.Promise.reject(new Error("Can't read the data of '"+a+"'. Is it in a supported JavaScript type (String, Blob, ArrayBuffer, etc) ?"))})}},{"./base64":1,"./external":6,"./nodejsUtils":14,"./support":30,"core-js/library/fn/set-immediate":36}],33:[function(a,b,c){"use strict";function d(a){this.files=[],this.loadOptions=a}var e=a("./reader/readerFor"),f=a("./utils"),g=a("./signature"),h=a("./zipEntry"),i=(a("./utf8"),a("./support"));d.prototype={checkSignature:function(a){if(!this.reader.readAndCheckSignature(a)){this.reader.index-=4;var b=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+f.pretty(b)+", expected "+f.pretty(a)+")")}},isSignature:function(a,b){var c=this.reader.index;this.reader.setIndex(a);var d=this.reader.readString(4),e=d===b;return this.reader.setIndex(c),e},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2);var a=this.reader.readData(this.zipCommentLength),b=i.uint8array?"uint8array":"array",c=f.transformTo(b,a);this.zipComment=this.loadOptions.decodeFileName(c)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.reader.skip(4),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;e<d;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readData(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(g.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8(),b.processAttributes()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(g.CENTRAL_FILE_HEADER);)a=new h({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a);if(this.centralDirRecords!==this.files.length&&0!==this.centralDirRecords&&0===this.files.length)throw new Error("Corrupted zip or bug: expected "+this.centralDirRecords+" records in central dir, got "+this.files.length)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(g.CENTRAL_DIRECTORY_END);if(a<0){var b=!this.isSignature(0,g.LOCAL_FILE_HEADER);throw b?new Error("Can't find end of central directory : is this a zip file ? If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html"):new Error("Corrupted zip: can't find end of central directory")}this.reader.setIndex(a);var c=a;if(this.checkSignature(g.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===f.MAX_VALUE_16BITS||this.diskWithCentralDirStart===f.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===f.MAX_VALUE_16BITS||this.centralDirRecords===f.MAX_VALUE_16BITS||this.centralDirSize===f.MAX_VALUE_32BITS||this.centralDirOffset===f.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(g.ZIP64_CENTRAL_DIRECTORY_LOCATOR),a<0)throw new Error("Corrupted zip: can't find the ZIP64 end of central directory locator");if(this.reader.setIndex(a),this.checkSignature(g.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),!this.isSignature(this.relativeOffsetEndOfZip64CentralDir,g.ZIP64_CENTRAL_DIRECTORY_END)&&(this.relativeOffsetEndOfZip64CentralDir=this.reader.lastIndexOfSignature(g.ZIP64_CENTRAL_DIRECTORY_END),this.relativeOffsetEndOfZip64CentralDir<0))throw new Error("Corrupted zip: can't find the ZIP64 end of central directory");this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(g.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}var d=this.centralDirOffset+this.centralDirSize;this.zip64&&(d+=20,d+=12+this.zip64EndOfCentralSize);var e=c-d;if(e>0)this.isSignature(c,g.CENTRAL_FILE_HEADER)||(this.reader.zero=e);else if(e<0)throw new Error("Corrupted zip: missing "+Math.abs(e)+" bytes.")},prepareReader:function(a){this.reader=e(a)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=d},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utf8":31,"./utils":32,"./zipEntry":34}],34:[function(a,b,c){"use strict";function d(a,b){this.options=a,this.loadOptions=b}var e=a("./reader/readerFor"),f=a("./utils"),g=a("./compressedObject"),h=a("./crc32"),i=a("./utf8"),j=a("./compressions"),k=a("./support"),l=0,m=3,n=function(a){for(var b in j)if(j.hasOwnProperty(b)&&j[b].magic===a)return j[b];return null};d.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readData(this.fileNameLength),a.skip(c),this.compressedSize===-1||this.uncompressedSize===-1)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize === -1 || uncompressedSize === -1)");if(b=n(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+f.pretty(this.compressionMethod)+" unknown (inner file : "+f.transformTo("string",this.fileName)+")");this.decompressed=new g(this.compressedSize,this.uncompressedSize,this.crc32,b,a.readData(this.compressedSize))},readCentralPart:function(a){this.versionMadeBy=a.readInt(2),a.skip(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4);var b=a.readInt(2);if(this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");a.skip(b),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var a=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),a===l&&(this.dosPermissions=63&this.externalFileAttributes),a===m&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(a){if(this.extraFields[1]){var b=e(this.extraFields[1].value);this.uncompressedSize===f.MAX_VALUE_32BITS&&(this.uncompressedSize=b.readInt(8)),this.compressedSize===f.MAX_VALUE_32BITS&&(this.compressedSize=b.readInt(8)),this.localHeaderOffset===f.MAX_VALUE_32BITS&&(this.localHeaderOffset=b.readInt(8)),this.diskNumberStart===f.MAX_VALUE_32BITS&&(this.diskNumberStart=b.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});a.index<e;)b=a.readInt(2),c=a.readInt(2),d=a.readData(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){var a=k.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=i.utf8decode(this.fileName),this.fileCommentStr=i.utf8decode(this.fileComment);else{var b=this.findExtraFieldUnicodePath();if(null!==b)this.fileNameStr=b;else{var c=f.transformTo(a,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(c)}var d=this.findExtraFieldUnicodeComment();if(null!==d)this.fileCommentStr=d;else{var e=f.transformTo(a,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(e)}}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=e(a.value);return 1!==b.readInt(1)?null:h(this.fileName)!==b.readInt(4)?null:i.utf8decode(b.readData(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=e(a.value);return 1!==b.readInt(1)?null:h(this.fileComment)!==b.readInt(4)?null:i.utf8decode(b.readData(a.length-5))}return null}},b.exports=d},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(a,b,c){"use strict";var d=a("./stream/StreamHelper"),e=a("./stream/DataWorker"),f=a("./utf8"),g=a("./compressedObject"),h=a("./stream/GenericWorker"),i=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this.unixPermissions=c.unixPermissions,this.dosPermissions=c.dosPermissions,this._data=b,this._dataBinary=c.binary,this.options={compression:c.compression,compressionOptions:c.compressionOptions}};i.prototype={internalStream:function(a){var b=null,c="string";try{if(!a)throw new Error("No output type specified.");c=a.toLowerCase();var e="string"===c||"text"===c;"binarystring"!==c&&"text"!==c||(c="string"),b=this._decompressWorker();var g=!this._dataBinary;g&&!e&&(b=b.pipe(new f.Utf8EncodeWorker)),!g&&e&&(b=b.pipe(new f.Utf8DecodeWorker))}catch(i){b=new h("error"),b.error(i)}return new d(b,c,"")},async:function(a,b){return this.internalStream(a).accumulate(b)},nodeStream:function(a,b){return this.internalStream(a||"nodebuffer").toNodejsStream(b)},_compressWorker:function(a,b){if(this._data instanceof g&&this._data.compression.magic===a.magic)return this._data.getCompressedWorker();var c=this._decompressWorker();return this._dataBinary||(c=c.pipe(new f.Utf8EncodeWorker)),g.createWorkerFrom(c,a,b)},_decompressWorker:function(){return this._data instanceof g?this._data.getContentWorker():this._data instanceof h?this._data:new e(this._data)}};for(var j=["asText","asBinary","asNodeBuffer","asUint8Array","asArrayBuffer"],k=function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},l=0;l<j.length;l++)i.prototype[j[l]]=k;b.exports=i},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(a,b,c){a("../modules/web.immediate"),b.exports=a("../modules/_core").setImmediate},{"../modules/_core":40,"../modules/web.immediate":56}],37:[function(a,b,c){b.exports=function(a){if("function"!=typeof a)throw TypeError(a+" is not a function!");return a}},{}],38:[function(a,b,c){var d=a("./_is-object");b.exports=function(a){if(!d(a))throw TypeError(a+" is not an object!");return a}},{"./_is-object":51}],39:[function(a,b,c){var d={}.toString;b.exports=function(a){return d.call(a).slice(8,-1)}},{}],40:[function(a,b,c){var d=b.exports={version:"2.3.0"};"number"==typeof __e&&(__e=d)},{}],41:[function(a,b,c){var d=a("./_a-function");b.exports=function(a,b,c){if(d(a),void 0===b)return a;switch(c){case 1:return function(c){return a.call(b,c)};case 2:return function(c,d){return a.call(b,c,d)};case 3:return function(c,d,e){return a.call(b,c,d,e)}}return function(){return a.apply(b,arguments)}}},{"./_a-function":37}],42:[function(a,b,c){b.exports=!a("./_fails")(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{"./_fails":45}],43:[function(a,b,c){var d=a("./_is-object"),e=a("./_global").document,f=d(e)&&d(e.createElement);b.exports=function(a){return f?e.createElement(a):{}}},{"./_global":46,"./_is-object":51}],44:[function(a,b,c){var d=a("./_global"),e=a("./_core"),f=a("./_ctx"),g=a("./_hide"),h="prototype",i=function(a,b,c){var j,k,l,m=a&i.F,n=a&i.G,o=a&i.S,p=a&i.P,q=a&i.B,r=a&i.W,s=n?e:e[b]||(e[b]={}),t=s[h],u=n?d:o?d[b]:(d[b]||{})[h];n&&(c=b);for(j in c)k=!m&&u&&void 0!==u[j],k&&j in s||(l=k?u[j]:c[j],s[j]=n&&"function"!=typeof u[j]?c[j]:q&&k?f(l,d):r&&u[j]==l?function(a){var b=function(b,c,d){if(this instanceof a){switch(arguments.length){case 0:return new a;case 1:return new a(b);case 2:return new a(b,c)}return new a(b,c,d)}return a.apply(this,arguments)};return b[h]=a[h],b}(l):p&&"function"==typeof l?f(Function.call,l):l,p&&((s.virtual||(s.virtual={}))[j]=l,a&i.R&&t&&!t[j]&&g(t,j,l)))};i.F=1,i.G=2,i.S=4,i.P=8,i.B=16,i.W=32,i.U=64,i.R=128,b.exports=i},{"./_core":40,"./_ctx":41,"./_global":46,"./_hide":47}],45:[function(a,b,c){b.exports=function(a){try{return!!a()}catch(b){return!0}}},{}],46:[function(a,b,c){var d=b.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=d)},{}],47:[function(a,b,c){var d=a("./_object-dp"),e=a("./_property-desc");b.exports=a("./_descriptors")?function(a,b,c){return d.f(a,b,e(1,c))}:function(a,b,c){return a[b]=c,a}},{"./_descriptors":42,"./_object-dp":52,"./_property-desc":53}],48:[function(a,b,c){b.exports=a("./_global").document&&document.documentElement},{"./_global":46}],49:[function(a,b,c){b.exports=!a("./_descriptors")&&!a("./_fails")(function(){return 7!=Object.defineProperty(a("./_dom-create")("div"),"a",{get:function(){return 7}}).a})},{"./_descriptors":42,"./_dom-create":43,"./_fails":45}],50:[function(a,b,c){b.exports=function(a,b,c){var d=void 0===c;switch(b.length){case 0:return d?a():a.call(c);case 1:return d?a(b[0]):a.call(c,b[0]);case 2:return d?a(b[0],b[1]):a.call(c,b[0],b[1]);case 3:return d?a(b[0],b[1],b[2]):a.call(c,b[0],b[1],b[2]);case 4:return d?a(b[0],b[1],b[2],b[3]):a.call(c,b[0],b[1],b[2],b[3])}return a.apply(c,b)}},{}],51:[function(a,b,c){b.exports=function(a){return"object"==typeof a?null!==a:"function"==typeof a}},{}],52:[function(a,b,c){var d=a("./_an-object"),e=a("./_ie8-dom-define"),f=a("./_to-primitive"),g=Object.defineProperty;c.f=a("./_descriptors")?Object.defineProperty:function(a,b,c){if(d(a),b=f(b,!0),d(c),e)try{return g(a,b,c)}catch(h){}if("get"in c||"set"in c)throw TypeError("Accessors not supported!");return"value"in c&&(a[b]=c.value),a}},{"./_an-object":38,"./_descriptors":42,"./_ie8-dom-define":49,"./_to-primitive":55}],53:[function(a,b,c){b.exports=function(a,b){return{enumerable:!(1&a),configurable:!(2&a),writable:!(4&a),value:b}}},{}],54:[function(a,b,c){var d,e,f,g=a("./_ctx"),h=a("./_invoke"),i=a("./_html"),j=a("./_dom-create"),k=a("./_global"),l=k.process,m=k.setImmediate,n=k.clearImmediate,o=k.MessageChannel,p=0,q={},r="onreadystatechange",s=function(){var a=+this;if(q.hasOwnProperty(a)){var b=q[a];delete q[a],b()}},t=function(a){s.call(a.data)};m&&n||(m=function(a){for(var b=[],c=1;arguments.length>c;)b.push(arguments[c++]);return q[++p]=function(){h("function"==typeof a?a:Function(a),b)},d(p),p},n=function(a){delete q[a]},"process"==a("./_cof")(l)?d=function(a){l.nextTick(g(s,a,1))}:o?(e=new o,f=e.port2,e.port1.onmessage=t,d=g(f.postMessage,f,1)):k.addEventListener&&"function"==typeof postMessage&&!k.importScripts?(d=function(a){k.postMessage(a+"","*")},k.addEventListener("message",t,!1)):d=r in j("script")?function(a){i.appendChild(j("script"))[r]=function(){i.removeChild(this),s.call(a)}}:function(a){setTimeout(g(s,a,1),0)}),b.exports={set:m,clear:n}},{"./_cof":39,"./_ctx":41,"./_dom-create":43,"./_global":46,"./_html":48,"./_invoke":50}],55:[function(a,b,c){var d=a("./_is-object");b.exports=function(a,b){if(!d(a))return a;var c,e;if(b&&"function"==typeof(c=a.toString)&&!d(e=c.call(a)))return e;if("function"==typeof(c=a.valueOf)&&!d(e=c.call(a)))return e;if(!b&&"function"==typeof(c=a.toString)&&!d(e=c.call(a)))return e;throw TypeError("Can't convert object to primitive value")}},{"./_is-object":51}],56:[function(a,b,c){var d=a("./_export"),e=a("./_task");d(d.G+d.B,{setImmediate:e.set,clearImmediate:e.clear})},{"./_export":44,"./_task":54}],57:[function(a,b,c){(function(a){"use strict";function c(){k=!0;for(var a,b,c=l.length;c;){for(b=l,l=[],a=-1;++a<c;)b[a]();c=l.length}k=!1}function d(a){1!==l.push(a)||k||e()}var e,f=a.MutationObserver||a.WebKitMutationObserver;if(f){var g=0,h=new f(c),i=a.document.createTextNode("");h.observe(i,{characterData:!0}),e=function(){i.data=g=++g%2}}else if(a.setImmediate||"undefined"==typeof a.MessageChannel)e="document"in a&&"onreadystatechange"in a.document.createElement("script")?function(){var b=a.document.createElement("script");b.onreadystatechange=function(){c(),b.onreadystatechange=null,b.parentNode.removeChild(b),b=null},a.document.documentElement.appendChild(b)}:function(){setTimeout(c,0)};else{var j=new a.MessageChannel;j.port1.onmessage=c,e=function(){j.port2.postMessage(0)}}var k,l=[];b.exports=d}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],58:[function(a,b,c){"use strict";function d(){}function e(a){if("function"!=typeof a)throw new TypeError("resolver must be a function");this.state=s,this.queue=[],this.outcome=void 0,a!==d&&i(this,a)}function f(a,b,c){this.promise=a,"function"==typeof b&&(this.onFulfilled=b,this.callFulfilled=this.otherCallFulfilled),"function"==typeof c&&(this.onRejected=c,this.callRejected=this.otherCallRejected)}function g(a,b,c){o(function(){var d;try{d=b(c)}catch(e){return p.reject(a,e)}d===a?p.reject(a,new TypeError("Cannot resolve promise with itself")):p.resolve(a,d)})}function h(a){var b=a&&a.then;if(a&&("object"==typeof a||"function"==typeof a)&&"function"==typeof b)return function(){b.apply(a,arguments)}}function i(a,b){function c(b){f||(f=!0,p.reject(a,b))}function d(b){f||(f=!0,p.resolve(a,b))}function e(){b(d,c)}var f=!1,g=j(e);"error"===g.status&&c(g.value)}function j(a,b){var c={};try{c.value=a(b),c.status="success"}catch(d){c.status="error",c.value=d}return c}function k(a){return a instanceof this?a:p.resolve(new this(d),a)}function l(a){var b=new this(d);return p.reject(b,a)}function m(a){function b(a,b){function d(a){g[b]=a,++h!==e||f||(f=!0,p.resolve(j,g))}c.resolve(a).then(d,function(a){f||(f=!0,p.reject(j,a))})}var c=this;if("[object Array]"!==Object.prototype.toString.call(a))return this.reject(new TypeError("must be an array"));var e=a.length,f=!1;if(!e)return this.resolve([]);for(var g=new Array(e),h=0,i=-1,j=new this(d);++i<e;)b(a[i],i);return j}function n(a){function b(a){c.resolve(a).then(function(a){f||(f=!0,p.resolve(h,a))},function(a){f||(f=!0,p.reject(h,a))})}var c=this;if("[object Array]"!==Object.prototype.toString.call(a))return this.reject(new TypeError("must be an array"));var e=a.length,f=!1;if(!e)return this.resolve([]);for(var g=-1,h=new this(d);++g<e;)b(a[g]);return h}var o=a("immediate"),p={},q=["REJECTED"],r=["FULFILLED"],s=["PENDING"];b.exports=e,e.prototype["catch"]=function(a){return this.then(null,a)},e.prototype.then=function(a,b){if("function"!=typeof a&&this.state===r||"function"!=typeof b&&this.state===q)return this;var c=new this.constructor(d);if(this.state!==s){var e=this.state===r?a:b;g(c,e,this.outcome)}else this.queue.push(new f(c,a,b));return c},f.prototype.callFulfilled=function(a){p.resolve(this.promise,a)},f.prototype.otherCallFulfilled=function(a){g(this.promise,this.onFulfilled,a)},f.prototype.callRejected=function(a){p.reject(this.promise,a)},f.prototype.otherCallRejected=function(a){g(this.promise,this.onRejected,a)},p.resolve=function(a,b){var c=j(h,b);if("error"===c.status)return p.reject(a,c.value);var d=c.value;if(d)i(a,d);else{a.state=r,a.outcome=b;for(var e=-1,f=a.queue.length;++e<f;)a.queue[e].callFulfilled(b)}return a},p.reject=function(a,b){a.state=q,a.outcome=b;for(var c=-1,d=a.queue.length;++c<d;)a.queue[c].callRejected(b);return a},e.resolve=k,e.reject=l,e.all=m,e.race=n},{immediate:57}],59:[function(a,b,c){"use strict";var d=a("./lib/utils/common").assign,e=a("./lib/deflate"),f=a("./lib/inflate"),g=a("./lib/zlib/constants"),h={};d(h,e,f,g),b.exports=h},{"./lib/deflate":60,"./lib/inflate":61,"./lib/utils/common":62,"./lib/zlib/constants":65}],60:[function(a,b,c){"use strict";function d(a){if(!(this instanceof d))return new d(a);this.options=i.assign({level:s,method:u,chunkSize:16384,windowBits:15,memLevel:8,strategy:t,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=h.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==p)throw new Error(k[c]);if(b.header&&h.deflateSetHeader(this.strm,b.header),b.dictionary){var e;if(e="string"==typeof b.dictionary?j.string2buf(b.dictionary):"[object ArrayBuffer]"===m.call(b.dictionary)?new Uint8Array(b.dictionary):b.dictionary,c=h.deflateSetDictionary(this.strm,e),c!==p)throw new Error(k[c]);this._dict_set=!0}}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg||k[c.err];return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}function g(a,b){return b=b||{},b.gzip=!0,e(a,b)}var h=a("./zlib/deflate"),i=a("./utils/common"),j=a("./utils/strings"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=Object.prototype.toString,n=0,o=4,p=0,q=1,r=2,s=-1,t=0,u=8;d.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?o:n,"string"==typeof a?e.input=j.string2buf(a):"[object ArrayBuffer]"===m.call(a)?e.input=new Uint8Array(a):e.input=a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new i.Buf8(f),e.next_out=0,e.avail_out=f),c=h.deflate(e,d),c!==q&&c!==p)return this.onEnd(c),this.ended=!0,!1;0!==e.avail_out&&(0!==e.avail_in||d!==o&&d!==r)||("string"===this.options.to?this.onData(j.buf2binstring(i.shrinkBuf(e.output,e.next_out))):this.onData(i.shrinkBuf(e.output,e.next_out)))}while((e.avail_in>0||0===e.avail_out)&&c!==q);return d===o?(c=h.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===p):d!==r||(this.onEnd(p),e.avail_out=0,!0)},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===p&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=i.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=d,c.deflate=e,c.deflateRaw=f,c.gzip=g},{"./utils/common":62,"./utils/strings":63,"./zlib/deflate":67,"./zlib/messages":72,"./zlib/zstream":74}],61:[function(a,b,c){"use strict";function d(a){if(!(this instanceof d))return new d(a);this.options=h.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=g.inflateInit2(this.strm,b.windowBits);if(c!==j.Z_OK)throw new Error(k[c]);this.header=new m,g.inflateGetHeader(this.strm,this.header)}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg||k[c.err];return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}var g=a("./zlib/inflate"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/constants"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=a("./zlib/gzheader"),n=Object.prototype.toString;d.prototype.push=function(a,b){var c,d,e,f,k,l,m=this.strm,o=this.options.chunkSize,p=this.options.dictionary,q=!1;if(this.ended)return!1;d=b===~~b?b:b===!0?j.Z_FINISH:j.Z_NO_FLUSH,"string"==typeof a?m.input=i.binstring2buf(a):"[object ArrayBuffer]"===n.call(a)?m.input=new Uint8Array(a):m.input=a,m.next_in=0,m.avail_in=m.input.length;do{if(0===m.avail_out&&(m.output=new h.Buf8(o),m.next_out=0,m.avail_out=o),c=g.inflate(m,j.Z_NO_FLUSH),c===j.Z_NEED_DICT&&p&&(l="string"==typeof p?i.string2buf(p):"[object ArrayBuffer]"===n.call(p)?new Uint8Array(p):p,c=g.inflateSetDictionary(this.strm,l)),c===j.Z_BUF_ERROR&&q===!0&&(c=j.Z_OK,q=!1),c!==j.Z_STREAM_END&&c!==j.Z_OK)return this.onEnd(c),this.ended=!0,!1;m.next_out&&(0!==m.avail_out&&c!==j.Z_STREAM_END&&(0!==m.avail_in||d!==j.Z_FINISH&&d!==j.Z_SYNC_FLUSH)||("string"===this.options.to?(e=i.utf8border(m.output,m.next_out),f=m.next_out-e,k=i.buf2string(m.output,e),m.next_out=f,m.avail_out=o-f,f&&h.arraySet(m.output,m.output,e,f,0),this.onData(k)):this.onData(h.shrinkBuf(m.output,m.next_out)))),0===m.avail_in&&0===m.avail_out&&(q=!0)}while((m.avail_in>0||0===m.avail_out)&&c!==j.Z_STREAM_END);return c===j.Z_STREAM_END&&(d=j.Z_FINISH),d===j.Z_FINISH?(c=g.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===j.Z_OK):d!==j.Z_SYNC_FLUSH||(this.onEnd(j.Z_OK),m.avail_out=0,!0)},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===j.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=d,c.inflate=e,c.inflateRaw=f,c.ungzip=e},{"./utils/common":62,"./utils/strings":63,"./zlib/constants":65,"./zlib/gzheader":68,"./zlib/inflate":70,"./zlib/messages":72,"./zlib/zstream":74}],62:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;f<d;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;b<c;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;b<c;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;f<d;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],63:[function(a,b,c){"use strict";function d(a,b){if(b<65537&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;d<b;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;j<256;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;f<h;f++)c=a.charCodeAt(f),55296===(64512&c)&&f+1<h&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=c<128?1:c<2048?2:c<65536?3:4;for(b=new e.Buf8(i),g=0,f=0;g<i;f++)c=a.charCodeAt(f),55296===(64512&c)&&f+1<h&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),c<128?b[g++]=c:c<2048?(b[g++]=192|c>>>6,b[g++]=128|63&c):c<65536?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;c<d;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;c<h;)if(f=a[c++],f<128)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&c<h;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:f<65536?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return c<0?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":62}],64:[function(a,b,c){"use strict";function d(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0;
-}b.exports=d},{}],65:[function(a,b,c){"use strict";b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],66:[function(a,b,c){"use strict";function d(){for(var a,b=[],c=0;c<256;c++){a=c;for(var d=0;d<8;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function e(a,b,c,d){var e=f,g=d+c;a^=-1;for(var h=d;h<g;h++)a=a>>>8^e[255&(a^b[h])];return a^-1}var f=d();b.exports=e},{}],67:[function(a,b,c){"use strict";function d(a,b){return a.msg=I[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(E.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){F._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,E.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=G(a.adler,b,e,c):2===a.state.wrap&&(a.adler=H(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-la?a.strstart-(a.w_size-la):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ka,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&f<m);if(d=ka-(m-f),f=m-ka,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-la)){E.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=ja)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+1])&a.hash_mask;a.insert&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+ja-1])&a.hash_mask,a.prev[f&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=f,f++,a.insert--,!(a.lookahead+a.insert<ja)););}while(a.lookahead<la&&0!==a.strm.avail_in)}function n(a,b){var c=65535;for(c>a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===J)return ua;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return ua;if(a.strstart-a.block_start>=a.w_size-la&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?ua:ua}function o(a,b){for(var c,d;;){if(a.lookahead<la){if(m(a),a.lookahead<la&&b===J)return ua;if(0===a.lookahead)break}if(c=0,a.lookahead>=ja&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),0!==c&&a.strstart-c<=a.w_size-la&&(a.match_length=l(a,c)),a.match_length>=ja)if(d=F._tr_tally(a,a.strstart-a.match_start,a.match_length-ja),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=ja){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart;while(0!==--a.match_length);a.strstart++}else a.strstart+=a.match_length,a.match_length=0,a.ins_h=a.window[a.strstart],a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+1])&a.hash_mask;else d=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=a.strstart<ja-1?a.strstart:ja-1,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function p(a,b){for(var c,d,e;;){if(a.lookahead<la){if(m(a),a.lookahead<la&&b===J)return ua;if(0===a.lookahead)break}if(c=0,a.lookahead>=ja&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),a.prev_length=a.match_length,a.prev_match=a.match_start,a.match_length=ja-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-la&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===U||a.match_length===ja&&a.strstart-a.match_start>4096)&&(a.match_length=ja-1)),a.prev_length>=ja&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-ja,d=F._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-ja),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ja-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart);while(0!==--a.prev_length);if(a.match_available=0,a.match_length=ja-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return ua}else if(a.match_available){if(d=F._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return ua}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=F._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<ja-1?a.strstart:ja-1,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ka){if(m(a),a.lookahead<=ka&&b===J)return ua;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=ja&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ka;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&e<f);a.match_length=ka-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=ja?(c=F._tr_tally(a,1,a.match_length-ja),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===J)return ua;break}if(a.match_length=0,c=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function s(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e}function t(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=D[a.level].max_lazy,a.good_match=D[a.level].good_length,a.nice_match=D[a.level].nice_length,a.max_chain_length=D[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=ja-1,a.match_available=0,a.ins_h=0}function u(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=$,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new E.Buf16(2*ha),this.dyn_dtree=new E.Buf16(2*(2*fa+1)),this.bl_tree=new E.Buf16(2*(2*ga+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new E.Buf16(ia+1),this.heap=new E.Buf16(2*ea+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new E.Buf16(2*ea+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function v(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=Z,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?na:sa,a.adler=2===b.wrap?0:1,b.last_flush=J,F._tr_init(b),O):d(a,Q)}function w(a){var b=v(a);return b===O&&t(a.state),b}function x(a,b){return a&&a.state?2!==a.state.wrap?Q:(a.state.gzhead=b,O):Q}function y(a,b,c,e,f,g){if(!a)return Q;var h=1;if(b===T&&(b=6),e<0?(h=0,e=-e):e>15&&(h=2,e-=16),f<1||f>_||c!==$||e<8||e>15||b<0||b>9||g<0||g>X)return d(a,Q);8===e&&(e=9);var i=new u;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<<i.w_bits,i.w_mask=i.w_size-1,i.hash_bits=f+7,i.hash_size=1<<i.hash_bits,i.hash_mask=i.hash_size-1,i.hash_shift=~~((i.hash_bits+ja-1)/ja),i.window=new E.Buf8(2*i.w_size),i.head=new E.Buf16(i.hash_size),i.prev=new E.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new E.Buf8(i.pending_buf_size),i.d_buf=1*i.lit_bufsize,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,w(a)}function z(a,b){return y(a,b,$,aa,ba,Y)}function A(a,b){var c,h,k,l;if(!a||!a.state||b>N||b<0)return a?d(a,Q):Q;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===ta&&b!==M)return d(a,0===a.avail_out?S:Q);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===na)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=V||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=H(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=oa):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=V||h.level<2?4:0),i(h,ya),h.status=sa);else{var m=$+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=V||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=ma),m+=31-m%31,h.status=sa,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===oa)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=pa)}else h.status=pa;if(h.status===pa)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.name.length?255&h.gzhead.name.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=qa)}else h.status=qa;if(h.status===qa)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.comment.length?255&h.gzhead.comment.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=ra)}else h.status=ra;if(h.status===ra&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=sa)):h.status=sa),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,O}else if(0===a.avail_in&&e(b)<=e(c)&&b!==M)return d(a,S);if(h.status===ta&&0!==a.avail_in)return d(a,S);if(0!==a.avail_in||0!==h.lookahead||b!==J&&h.status!==ta){var o=h.strategy===V?r(h,b):h.strategy===W?q(h,b):D[h.level].func(h,b);if(o!==wa&&o!==xa||(h.status=ta),o===ua||o===wa)return 0===a.avail_out&&(h.last_flush=-1),O;if(o===va&&(b===K?F._tr_align(h):b!==N&&(F._tr_stored_block(h,0,0,!1),b===L&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,O}return b!==M?O:h.wrap<=0?P:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?O:P)}function B(a){var b;return a&&a.state?(b=a.state.status,b!==na&&b!==oa&&b!==pa&&b!==qa&&b!==ra&&b!==sa&&b!==ta?d(a,Q):(a.state=null,b===sa?d(a,R):O)):Q}function C(a,b){var c,d,e,g,h,i,j,k,l=b.length;if(!a||!a.state)return Q;if(c=a.state,g=c.wrap,2===g||1===g&&c.status!==na||c.lookahead)return Q;for(1===g&&(a.adler=G(a.adler,b,l,0)),c.wrap=0,l>=c.w_size&&(0===g&&(f(c.head),c.strstart=0,c.block_start=0,c.insert=0),k=new E.Buf8(c.w_size),E.arraySet(k,b,l-c.w_size,c.w_size,0),b=k,l=c.w_size),h=a.avail_in,i=a.next_in,j=a.input,a.avail_in=l,a.next_in=0,a.input=b,m(c);c.lookahead>=ja;){d=c.strstart,e=c.lookahead-(ja-1);do c.ins_h=(c.ins_h<<c.hash_shift^c.window[d+ja-1])&c.hash_mask,c.prev[d&c.w_mask]=c.head[c.ins_h],c.head[c.ins_h]=d,d++;while(--e);c.strstart=d,c.lookahead=ja-1,m(c)}return c.strstart+=c.lookahead,c.block_start=c.strstart,c.insert=c.lookahead,c.lookahead=0,c.match_length=c.prev_length=ja-1,c.match_available=0,a.next_in=i,a.input=j,a.avail_in=h,c.wrap=g,O}var D,E=a("../utils/common"),F=a("./trees"),G=a("./adler32"),H=a("./crc32"),I=a("./messages"),J=0,K=1,L=3,M=4,N=5,O=0,P=1,Q=-2,R=-3,S=-5,T=-1,U=1,V=2,W=3,X=4,Y=0,Z=2,$=8,_=9,aa=15,ba=8,ca=29,da=256,ea=da+1+ca,fa=30,ga=19,ha=2*ea+1,ia=15,ja=3,ka=258,la=ka+ja+1,ma=32,na=42,oa=69,pa=73,qa=91,ra=103,sa=113,ta=666,ua=1,va=2,wa=3,xa=4,ya=3;D=[new s(0,0,0,0,n),new s(4,4,8,4,o),new s(4,5,16,8,o),new s(4,6,32,32,o),new s(4,4,16,16,p),new s(8,16,32,32,p),new s(8,16,128,128,p),new s(8,32,128,256,p),new s(32,128,258,1024,p),new s(32,258,258,4096,p)],c.deflateInit=z,c.deflateInit2=y,c.deflateReset=w,c.deflateResetKeep=v,c.deflateSetHeader=x,c.deflate=A,c.deflateEnd=B,c.deflateSetDictionary=C,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":62,"./adler32":64,"./crc32":66,"./messages":72,"./trees":73}],68:[function(a,b,c){"use strict";function d(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=d},{}],69:[function(a,b,c){"use strict";var d=30,e=12;b.exports=function(a,b){var c,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;c=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=c.dmax,l=c.wsize,m=c.whave,n=c.wnext,o=c.window,p=c.hold,q=c.bits,r=c.lencode,s=c.distcode,t=(1<<c.lenbits)-1,u=(1<<c.distbits)-1;a:do{q<15&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=r[p&t];b:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<<w)-1)];continue b}if(32&w){c.mode=e;break a}a.msg="invalid literal/length code",c.mode=d;break a}x=65535&v,w&=15,w&&(q<w&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),q<15&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=s[p&u];c:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<<w)-1)];continue c}a.msg="invalid distance code",c.mode=d;break a}if(y=65535&v,w&=15,q<w&&(p+=B[f++]<<q,q+=8,q<w&&(p+=B[f++]<<q,q+=8)),y+=p&(1<<w)-1,y>k){a.msg="invalid distance too far back",c.mode=d;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&c.sane){a.msg="invalid distance too far back",c.mode=d;break a}if(z=0,A=o,0===n){if(z+=l-w,w<x){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(n<w){if(z+=l+n-w,w-=n,w<x){x-=w;do C[h++]=o[z++];while(--w);if(z=0,n<x){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,w<x){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(f<g&&h<j);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=f<g?5+(g-f):5-(f-g),a.avail_out=h<j?257+(j-h):257-(h-j),c.hold=p,c.bits=q}},{}],70:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new s.Buf16(320),this.work=new s.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=L,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new s.Buf32(pa),b.distcode=b.distdyn=new s.Buf32(qa),b.sane=1,b.back=-1,D):G}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):G}function h(a,b){var c,d;return a&&a.state?(d=a.state,b<0?(c=0,b=-b):(c=(b>>4)+1,b<48&&(b&=15)),b&&(b<8||b>15)?G:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):G}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==D&&(a.state=null),c):G}function j(a){return i(a,sa)}function k(a){if(ta){var b;for(q=new s.Buf32(512),r=new s.Buf32(32),b=0;b<144;)a.lens[b++]=8;for(;b<256;)a.lens[b++]=9;for(;b<280;)a.lens[b++]=7;for(;b<288;)a.lens[b++]=8;for(w(y,a.lens,0,288,q,0,a.work,{bits:9}),b=0;b<32;)a.lens[b++]=5;w(z,a.lens,0,32,r,0,a.work,{bits:5}),ta=!1}a.lencode=q,a.lenbits=9,a.distcode=r,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<<f.wbits,f.wnext=0,f.whave=0,f.window=new s.Buf8(f.wsize)),d>=f.wsize?(s.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),s.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(s.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave<f.wsize&&(f.whave+=e))),0}function m(a,b){var c,e,f,g,h,i,j,m,n,o,p,q,r,pa,qa,ra,sa,ta,ua,va,wa,xa,ya,za,Aa=0,Ba=new s.Buf8(4),Ca=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!a||!a.state||!a.output||!a.input&&0!==a.avail_in)return G;c=a.state,c.mode===W&&(c.mode=X),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,o=i,p=j,xa=D;a:for(;;)switch(c.mode){case L:if(0===c.wrap){c.mode=X;break}for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(2&c.wrap&&35615===m){c.check=0,Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0),m=0,n=0,c.mode=M;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=ma;break}if((15&m)!==K){a.msg="unknown compression method",c.mode=ma;break}if(m>>>=4,n-=4,wa=(15&m)+8,0===c.wbits)c.wbits=wa;else if(wa>c.wbits){a.msg="invalid window size",c.mode=ma;break}c.dmax=1<<wa,a.adler=c.check=1,c.mode=512&m?U:W,m=0,n=0;break;case M:for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==K){a.msg="unknown compression method",c.mode=ma;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=ma;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0,c.mode=N;case N:for(;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.time=m),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,Ba[2]=m>>>16&255,Ba[3]=m>>>24&255,c.check=u(c.check,Ba,4,0)),m=0,n=0,c.mode=O;case O:for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.xflags=255&m,c.head.os=m>>8),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0,c.mode=P;case P:if(1024&c.flags){for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length=m,c.head&&(c.head.extra_len=m),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=Q;case Q:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wa=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),s.arraySet(c.head.extra,e,g,q,wa)),512&c.flags&&(c.check=u(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=R;case R:if(2048&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.name+=String.fromCharCode(wa));while(wa&&q<i);if(512&c.flags&&(c.check=u(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=S;case S:if(4096&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.comment+=String.fromCharCode(wa));while(wa&&q<i);if(512&c.flags&&(c.check=u(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.comment=null);c.mode=T;case T:if(512&c.flags){for(;n<16;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=ma;break}m=0,n=0}c.head&&(c.head.hcrc=c.flags>>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=W;break;case U:for(;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=V;case V:if(0===c.havedict)return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,F;a.adler=c.check=1,c.mode=W;case W:if(b===B||b===C)break a;case X:if(c.last){m>>>=7&n,n-=7&n,c.mode=ja;break}for(;n<3;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}switch(c.last=1&m,m>>>=1,n-=1,3&m){case 0:c.mode=Y;break;case 1:if(k(c),c.mode=ca,b===C){m>>>=2,n-=2;break a}break;case 2:c.mode=_;break;case 3:a.msg="invalid block type",c.mode=ma}m>>>=2,n-=2;break;case Y:for(m>>>=7&n,n-=7&n;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if((65535&m)!==(m>>>16^65535)){a.msg="invalid stored block lengths",c.mode=ma;break}if(c.length=65535&m,m=0,n=0,c.mode=Z,b===C)break a;case Z:c.mode=$;case $:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;s.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=W;break;case _:for(;n<14;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.nlen=(31&m)+257,m>>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=ma;break}c.have=0,c.mode=aa;case aa:for(;c.have<c.ncode;){for(;n<3;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.lens[Ca[c.have++]]=7&m,m>>>=3,n-=3}for(;c.have<19;)c.lens[Ca[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,ya={bits:c.lenbits},xa=w(x,c.lens,0,19,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid code lengths set",c.mode=ma;break}c.have=0,c.mode=ba;case ba:for(;c.have<c.nlen+c.ndist;){for(;Aa=c.lencode[m&(1<<c.lenbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(sa<16)m>>>=qa,n-=qa,c.lens[c.have++]=sa;else{if(16===sa){for(za=qa+2;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m>>>=qa,n-=qa,0===c.have){a.msg="invalid bit length repeat",c.mode=ma;break}wa=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sa){for(za=qa+3;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qa,n-=qa,wa=0,q=3+(7&m),m>>>=3,n-=3}else{for(za=qa+7;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qa,n-=qa,wa=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=ma;break}for(;q--;)c.lens[c.have++]=wa}}if(c.mode===ma)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=ma;break}if(c.lenbits=9,ya={bits:c.lenbits},xa=w(y,c.lens,0,c.nlen,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid literal/lengths set",c.mode=ma;break}if(c.distbits=6,c.distcode=c.distdyn,ya={bits:c.distbits},xa=w(z,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,ya),c.distbits=ya.bits,xa){a.msg="invalid distances set",c.mode=ma;break}if(c.mode=ca,b===C)break a;case ca:c.mode=da;case da:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,v(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===W&&(c.back=-1);break}for(c.back=0;Aa=c.lencode[m&(1<<c.lenbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(ra&&0===(240&ra)){for(ta=qa,ua=ra,va=sa;Aa=c.lencode[va+((m&(1<<ta+ua)-1)>>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(ta+qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,c.length=sa,0===ra){c.mode=ia;break}if(32&ra){c.back=-1,c.mode=W;break}if(64&ra){a.msg="invalid literal/length code",c.mode=ma;break}c.extra=15&ra,c.mode=ea;case ea:if(c.extra){for(za=c.extra;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=fa;case fa:for(;Aa=c.distcode[m&(1<<c.distbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(0===(240&ra)){for(ta=qa,ua=ra,va=sa;Aa=c.distcode[va+((m&(1<<ta+ua)-1)>>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(ta+qa<=n);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,64&ra){a.msg="invalid distance code",c.mode=ma;break}c.offset=sa,c.extra=15&ra,c.mode=ga;case ga:if(c.extra){for(za=c.extra;n<za;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.offset+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=ma;break}c.mode=ha;case ha:if(0===j)break a;if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=ma;break}q>c.wnext?(q-=c.wnext,r=c.wsize-q):r=c.wnext-q,q>c.length&&(q=c.length),pa=c.window}else pa=f,r=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pa[r++];while(--q);0===c.length&&(c.mode=da);break;case ia:if(0===j)break a;f[h++]=c.length,j--,c.mode=da;break;case ja:if(c.wrap){for(;n<32;){if(0===i)break a;i--,m|=e[g++]<<n,n+=8}if(p-=j,a.total_out+=p,c.total+=p,p&&(a.adler=c.check=c.flags?u(c.check,f,p,h-p):t(c.check,f,p,h-p)),p=j,(c.flags?m:d(m))!==c.check){a.msg="incorrect data check",c.mode=ma;break}m=0,n=0}c.mode=ka;case ka:if(c.wrap&&c.flags){for(;n<32;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(4294967295&c.total)){a.msg="incorrect length check",c.mode=ma;break}m=0,n=0}c.mode=la;case la:xa=E;break a;case ma:xa=H;break a;case na:return I;case oa:default:return G}return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,(c.wsize||p!==a.avail_out&&c.mode<ma&&(c.mode<ja||b!==A))&&l(a,a.output,a.next_out,p-a.avail_out)?(c.mode=na,I):(o-=a.avail_in,p-=a.avail_out,a.total_in+=o,a.total_out+=p,c.total+=p,c.wrap&&p&&(a.adler=c.check=c.flags?u(c.check,f,p,a.next_out-p):t(c.check,f,p,a.next_out-p)),a.data_type=c.bits+(c.last?64:0)+(c.mode===W?128:0)+(c.mode===ca||c.mode===Z?256:0),(0===o&&0===p||b===A)&&xa===D&&(xa=J),xa)}function n(a){if(!a||!a.state)return G;var b=a.state;return b.window&&(b.window=null),a.state=null,D}function o(a,b){var c;return a&&a.state?(c=a.state,0===(2&c.wrap)?G:(c.head=b,b.done=!1,D)):G}function p(a,b){var c,d,e,f=b.length;return a&&a.state?(c=a.state,0!==c.wrap&&c.mode!==V?G:c.mode===V&&(d=1,d=t(d,b,f,0),d!==c.check)?H:(e=l(a,b,f,f))?(c.mode=na,I):(c.havedict=1,D)):G}var q,r,s=a("../utils/common"),t=a("./adler32"),u=a("./crc32"),v=a("./inffast"),w=a("./inftrees"),x=0,y=1,z=2,A=4,B=5,C=6,D=0,E=1,F=2,G=-2,H=-3,I=-4,J=-5,K=8,L=1,M=2,N=3,O=4,P=5,Q=6,R=7,S=8,T=9,U=10,V=11,W=12,X=13,Y=14,Z=15,$=16,_=17,aa=18,ba=19,ca=20,da=21,ea=22,fa=23,ga=24,ha=25,ia=26,ja=27,ka=28,la=29,ma=30,na=31,oa=32,pa=852,qa=592,ra=15,sa=ra,ta=!0;c.inflateReset=g,c.inflateReset2=h,c.inflateResetKeep=f,c.inflateInit=j,c.inflateInit2=i,c.inflate=m,c.inflateEnd=n,c.inflateGetHeader=o,c.inflateSetDictionary=p,c.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":62,"./adler32":64,"./crc32":66,"./inffast":69,"./inftrees":71}],71:[function(a,b,c){"use strict";var d=a("../utils/common"),e=15,f=852,g=592,h=0,i=1,j=2,k=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],l=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],m=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],n=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];b.exports=function(a,b,c,o,p,q,r,s){var t,u,v,w,x,y,z,A,B,C=s.bits,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=null,O=0,P=new d.Buf16(e+1),Q=new d.Buf16(e+1),R=null,S=0;for(D=0;D<=e;D++)P[D]=0;for(E=0;E<o;E++)P[b[c+E]]++;for(H=C,G=e;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;F<G&&0===P[F];F++);for(H<F&&(H=F),K=1,D=1;D<=e;D++)if(K<<=1,K-=P[D],K<0)return-1;if(K>0&&(a===h||1!==G))return-1;for(Q[1]=0,D=1;D<e;D++)Q[D+1]=Q[D]+P[D];for(E=0;E<o;E++)0!==b[c+E]&&(r[Q[b[c+E]]++]=E);if(a===h?(N=R=r,y=19):a===i?(N=k,O-=257,R=l,S-=257,y=256):(N=m,R=n,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<<H,w=L-1,a===i&&L>f||a===j&&L>g)return 1;for(;;){z=D-J,r[E]<y?(A=0,B=r[E]):r[E]>y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<<D-J,u=1<<I,F=u;do u-=t,p[x+(M>>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<<D-1;M&t;)t>>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[c+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<<I;I+J<G&&(K-=P[I+J],!(K<=0));)I++,K<<=1;if(L+=1<<I,a===i&&L>f||a===j&&L>g)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":62}],72:[function(a,b,c){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],73:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length}function f(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b}function g(a){return a<256?ia[a]:ia[256+(a>>>7)]}function h(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function i(a,b,c){a.bi_valid>X-c?(a.bi_buf|=b<<a.bi_valid&65535,h(a,a.bi_buf),a.bi_buf=b>>X-a.bi_valid,a.bi_valid+=c-X):(a.bi_buf|=b<<a.bi_valid&65535,a.bi_valid+=c)}function j(a,b,c){i(a,c[2*b],c[2*b+1])}function k(a,b){var c=0;do c|=1&a,a>>>=1,c<<=1;while(--b>0);return c>>>1}function l(a){16===a.bi_valid?(h(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function m(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;f<=W;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,
-c=a.heap_max+1;c<V;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function n(a,b,c){var d,e,f=new Array(W+1),g=0;for(d=1;d<=W;d++)f[d]=g=g+c[d-1]<<1;for(e=0;e<=b;e++){var h=a[2*e+1];0!==h&&(a[2*e]=k(f[h]++,h))}}function o(){var a,b,c,d,f,g=new Array(W+1);for(c=0,d=0;d<Q-1;d++)for(ka[d]=c,a=0;a<1<<ba[d];a++)ja[c++]=d;for(ja[c-1]=d,f=0,d=0;d<16;d++)for(la[d]=f,a=0;a<1<<ca[d];a++)ia[f++]=d;for(f>>=7;d<T;d++)for(la[d]=f<<7,a=0;a<1<<ca[d]-7;a++)ia[256+f++]=d;for(b=0;b<=W;b++)g[b]=0;for(a=0;a<=143;)ga[2*a+1]=8,a++,g[8]++;for(;a<=255;)ga[2*a+1]=9,a++,g[9]++;for(;a<=279;)ga[2*a+1]=7,a++,g[7]++;for(;a<=287;)ga[2*a+1]=8,a++,g[8]++;for(n(ga,S+1,g),a=0;a<T;a++)ha[2*a+1]=5,ha[2*a]=k(a,5);ma=new e(ga,ba,R+1,S,W),na=new e(ha,ca,0,T,W),oa=new e(new Array(0),da,0,U,Y)}function p(a){var b;for(b=0;b<S;b++)a.dyn_ltree[2*b]=0;for(b=0;b<T;b++)a.dyn_dtree[2*b]=0;for(b=0;b<U;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*Z]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function q(a){a.bi_valid>8?h(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function r(a,b,c,d){q(a),d&&(h(a,c),h(a,~c)),G.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function s(a,b,c,d){var e=2*b,f=2*c;return a[e]<a[f]||a[e]===a[f]&&d[b]<=d[c]}function t(a,b,c){for(var d=a.heap[c],e=c<<1;e<=a.heap_len&&(e<a.heap_len&&s(b,a.heap[e+1],a.heap[e],a.depth)&&e++,!s(b,d,a.heap[e],a.depth));)a.heap[c]=a.heap[e],c=e,e<<=1;a.heap[c]=d}function u(a,b,c){var d,e,f,h,k=0;if(0!==a.last_lit)do d=a.pending_buf[a.d_buf+2*k]<<8|a.pending_buf[a.d_buf+2*k+1],e=a.pending_buf[a.l_buf+k],k++,0===d?j(a,e,b):(f=ja[e],j(a,f+R+1,b),h=ba[f],0!==h&&(e-=ka[f],i(a,e,h)),d--,f=g(d),j(a,f,c),h=ca[f],0!==h&&(d-=la[f],i(a,d,h)));while(k<a.last_lit);j(a,Z,b)}function v(a,b){var c,d,e,f=b.dyn_tree,g=b.stat_desc.static_tree,h=b.stat_desc.has_stree,i=b.stat_desc.elems,j=-1;for(a.heap_len=0,a.heap_max=V,c=0;c<i;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=j<2?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)t(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],t(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,t(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],m(a,b),n(f,j,a.bl_count)}function w(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;d<=c;d++)e=g,g=b[2*(d+1)+1],++h<i&&e===g||(h<j?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*$]++):h<=10?a.bl_tree[2*_]++:a.bl_tree[2*aa]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function x(a,b,c){var d,e,f=-1,g=b[1],h=0,k=7,l=4;for(0===g&&(k=138,l=3),d=0;d<=c;d++)if(e=g,g=b[2*(d+1)+1],!(++h<k&&e===g)){if(h<l){do j(a,e,a.bl_tree);while(0!==--h)}else 0!==e?(e!==f&&(j(a,e,a.bl_tree),h--),j(a,$,a.bl_tree),i(a,h-3,2)):h<=10?(j(a,_,a.bl_tree),i(a,h-3,3)):(j(a,aa,a.bl_tree),i(a,h-11,7));h=0,f=e,0===g?(k=138,l=3):e===g?(k=6,l=3):(k=7,l=4)}}function y(a){var b;for(w(a,a.dyn_ltree,a.l_desc.max_code),w(a,a.dyn_dtree,a.d_desc.max_code),v(a,a.bl_desc),b=U-1;b>=3&&0===a.bl_tree[2*ea[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function z(a,b,c,d){var e;for(i(a,b-257,5),i(a,c-1,5),i(a,d-4,4),e=0;e<d;e++)i(a,a.bl_tree[2*ea[e]+1],3);x(a,a.dyn_ltree,b-1),x(a,a.dyn_dtree,c-1)}function A(a){var b,c=4093624447;for(b=0;b<=31;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return I;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return J;for(b=32;b<R;b++)if(0!==a.dyn_ltree[2*b])return J;return I}function B(a){pa||(o(),pa=!0),a.l_desc=new f(a.dyn_ltree,ma),a.d_desc=new f(a.dyn_dtree,na),a.bl_desc=new f(a.bl_tree,oa),a.bi_buf=0,a.bi_valid=0,p(a)}function C(a,b,c,d){i(a,(L<<1)+(d?1:0),3),r(a,b,c,!0)}function D(a){i(a,M<<1,3),j(a,Z,ga),l(a)}function E(a,b,c,d){var e,f,g=0;a.level>0?(a.strm.data_type===K&&(a.strm.data_type=A(a)),v(a,a.l_desc),v(a,a.d_desc),g=y(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,f<=e&&(e=f)):e=f=c+5,c+4<=e&&b!==-1?C(a,b,c,d):a.strategy===H||f===e?(i(a,(M<<1)+(d?1:0),3),u(a,ga,ha)):(i(a,(N<<1)+(d?1:0),3),z(a,a.l_desc.max_code+1,a.d_desc.max_code+1,g+1),u(a,a.dyn_ltree,a.dyn_dtree)),p(a),d&&q(a)}function F(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(ja[c]+R+1)]++,a.dyn_dtree[2*g(b)]++),a.last_lit===a.lit_bufsize-1}var G=a("../utils/common"),H=4,I=0,J=1,K=2,L=0,M=1,N=2,O=3,P=258,Q=29,R=256,S=R+1+Q,T=30,U=19,V=2*S+1,W=15,X=16,Y=7,Z=256,$=16,_=17,aa=18,ba=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ca=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],da=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],ea=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],fa=512,ga=new Array(2*(S+2));d(ga);var ha=new Array(2*T);d(ha);var ia=new Array(fa);d(ia);var ja=new Array(P-O+1);d(ja);var ka=new Array(Q);d(ka);var la=new Array(T);d(la);var ma,na,oa,pa=!1;c._tr_init=B,c._tr_stored_block=C,c._tr_flush_block=E,c._tr_tally=F,c._tr_align=D},{"../utils/common":62}],74:[function(a,b,c){"use strict";function d(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=d},{}]},{},[10])(10)});
+
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=t()}}(function(){return function s(a,o,h){function u(r,t){if(!o[r]){if(!a[r]){var e="function"==typeof require&&require;if(!t&&e)return e(r,!0);if(l)return l(r,!0);var i=new Error("Cannot find module '"+r+"'");throw i.code="MODULE_NOT_FOUND",i}var n=o[r]={exports:{}};a[r][0].call(n.exports,function(t){var e=a[r][1][t];return u(e||t)},n,n.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,t=0;t<h.length;t++)u(h[t]);return u}({1:[function(t,e,r){"use strict";var c=t("./utils"),d=t("./support"),p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.encode=function(t){for(var e,r,i,n,s,a,o,h=[],u=0,l=t.length,f=l,d="string"!==c.getTypeOf(t);u<t.length;)f=l-u,i=d?(e=t[u++],r=u<l?t[u++]:0,u<l?t[u++]:0):(e=t.charCodeAt(u++),r=u<l?t.charCodeAt(u++):0,u<l?t.charCodeAt(u++):0),n=e>>2,s=(3&e)<<4|r>>4,a=1<f?(15&r)<<2|i>>6:64,o=2<f?63&i:64,h.push(p.charAt(n)+p.charAt(s)+p.charAt(a)+p.charAt(o));return h.join("")},r.decode=function(t){var e,r,i,n,s,a,o=0,h=0,u="data:";if(t.substr(0,u.length)===u)throw new Error("Invalid base64 input, it looks like a data url.");var l,f=3*(t=t.replace(/[^A-Za-z0-9\+\/\=]/g,"")).length/4;if(t.charAt(t.length-1)===p.charAt(64)&&f--,t.charAt(t.length-2)===p.charAt(64)&&f--,f%1!=0)throw new Error("Invalid base64 input, bad content length.");for(l=d.uint8array?new Uint8Array(0|f):new Array(0|f);o<t.length;)e=p.indexOf(t.charAt(o++))<<2|(n=p.indexOf(t.charAt(o++)))>>4,r=(15&n)<<4|(s=p.indexOf(t.charAt(o++)))>>2,i=(3&s)<<6|(a=p.indexOf(t.charAt(o++))),l[h++]=e,64!==s&&(l[h++]=r),64!==a&&(l[h++]=i);return l}},{"./support":30,"./utils":32}],2:[function(t,e,r){"use strict";var i=t("./external"),n=t("./stream/DataWorker"),s=t("./stream/DataLengthProbe"),a=t("./stream/Crc32Probe");s=t("./stream/DataLengthProbe");function o(t,e,r,i,n){this.compressedSize=t,this.uncompressedSize=e,this.crc32=r,this.compression=i,this.compressedContent=n}o.prototype={getContentWorker:function(){var t=new n(i.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new s("data_length")),e=this;return t.on("end",function(){if(this.streamInfo.data_length!==e.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),t},getCompressedWorker:function(){return new n(i.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(t,e,r){return t.pipe(new a).pipe(new s("uncompressedSize")).pipe(e.compressWorker(r)).pipe(new s("compressedSize")).withStreamInfo("compression",e)},e.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(t,e,r){"use strict";var i=t("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(t){return new i("STORE compression")},uncompressWorker:function(){return new i("STORE decompression")}},r.DEFLATE=t("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(t,e,r){"use strict";var i=t("./utils");var o=function(){for(var t,e=[],r=0;r<256;r++){t=r;for(var i=0;i<8;i++)t=1&t?3988292384^t>>>1:t>>>1;e[r]=t}return e}();e.exports=function(t,e){return void 0!==t&&t.length?"string"!==i.getTypeOf(t)?function(t,e,r,i){var n=o,s=i+r;t^=-1;for(var a=i;a<s;a++)t=t>>>8^n[255&(t^e[a])];return-1^t}(0|e,t,t.length,0):function(t,e,r,i){var n=o,s=i+r;t^=-1;for(var a=i;a<s;a++)t=t>>>8^n[255&(t^e.charCodeAt(a))];return-1^t}(0|e,t,t.length,0):0}},{"./utils":32}],5:[function(t,e,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(t,e,r){"use strict";var i=null;i="undefined"!=typeof Promise?Promise:t("lie"),e.exports={Promise:i}},{lie:37}],7:[function(t,e,r){"use strict";var i="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,n=t("pako"),s=t("./utils"),a=t("./stream/GenericWorker"),o=i?"uint8array":"array";function h(t,e){a.call(this,"FlateWorker/"+t),this._pako=null,this._pakoAction=t,this._pakoOptions=e,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(t){this.meta=t.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,t.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new n[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var e=this;this._pako.onData=function(t){e.push({data:t,meta:e.meta})}},r.compressWorker=function(t){return new h("Deflate",t)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(t,e,r){"use strict";function A(t,e){var r,i="";for(r=0;r<e;r++)i+=String.fromCharCode(255&t),t>>>=8;return i}function i(t,e,r,i,n,s){var a,o,h=t.file,u=t.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),d=I.transformTo("string",O.utf8encode(h.name)),c=h.comment,p=I.transformTo("string",s(c)),m=I.transformTo("string",O.utf8encode(c)),_=d.length!==h.name.length,g=m.length!==c.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};e&&!r||(x.crc32=t.crc32,x.compressedSize=t.compressedSize,x.uncompressedSize=t.uncompressedSize);var S=0;e&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===n?(C=798,z|=function(t,e){var r=t;return t||(r=e?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(t){return 63&(t||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+d,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(i,4)+f+b+p}}var I=t("../utils"),n=t("../stream/GenericWorker"),O=t("../utf8"),B=t("../crc32"),R=t("../signature");function s(t,e,r,i){n.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=e,this.zipPlatform=r,this.encodeFileName=i,this.streamFiles=t,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,n),s.prototype.push=function(t){var e=t.meta.percent||0,r=this.entriesCount,i=this._sources.length;this.accumulate?this.contentBuffer.push(t):(this.bytesWritten+=t.data.length,n.prototype.push.call(this,{data:t.data,meta:{currentFile:this.currentFile,percent:r?(e+100*(r-i-1))/r:100}}))},s.prototype.openedSource=function(t){this.currentSourceOffset=this.bytesWritten,this.currentFile=t.file.name;var e=this.streamFiles&&!t.file.dir;if(e){var r=i(t,e,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(t){this.accumulate=!1;var e=this.streamFiles&&!t.file.dir,r=i(t,e,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),e)this.push({data:function(t){return R.DATA_DESCRIPTOR+A(t.crc32,4)+A(t.compressedSize,4)+A(t.uncompressedSize,4)}(t),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var t=this.bytesWritten,e=0;e<this.dirRecords.length;e++)this.push({data:this.dirRecords[e],meta:{percent:100}});var r=this.bytesWritten-t,i=function(t,e,r,i,n){var s=I.transformTo("string",n(i));return R.CENTRAL_DIRECTORY_END+"\0\0\0\0"+A(t,2)+A(t,2)+A(e,4)+A(r,4)+A(s.length,2)+s}(this.dirRecords.length,r,t,this.zipComment,this.encodeFileName);this.push({data:i,meta:{percent:100}})},s.prototype.prepareNextSource=function(){this.previous=this._sources.shift(),this.openedSource(this.previous.streamInfo),this.isPaused?this.previous.pause():this.previous.resume()},s.prototype.registerPrevious=function(t){this._sources.push(t);var e=this;return t.on("data",function(t){e.processChunk(t)}),t.on("end",function(){e.closedSource(e.previous.streamInfo),e._sources.length?e.prepareNextSource():e.end()}),t.on("error",function(t){e.error(t)}),this},s.prototype.resume=function(){return!!n.prototype.resume.call(this)&&(!this.previous&&this._sources.length?(this.prepareNextSource(),!0):this.previous||this._sources.length||this.generatedError?void 0:(this.end(),!0))},s.prototype.error=function(t){var e=this._sources;if(!n.prototype.error.call(this,t))return!1;for(var r=0;r<e.length;r++)try{e[r].error(t)}catch(t){}return!0},s.prototype.lock=function(){n.prototype.lock.call(this);for(var t=this._sources,e=0;e<t.length;e++)t[e].lock()},e.exports=s},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(t,e,r){"use strict";var u=t("../compressions"),i=t("./ZipFileWorker");r.generateWorker=function(t,a,e){var o=new i(a.streamFiles,e,a.platform,a.encodeFileName),h=0;try{t.forEach(function(t,e){h++;var r=function(t,e){var r=t||e,i=u[r];if(!i)throw new Error(r+" is not a valid compression method !");return i}(e.options.compression,a.compression),i=e.options.compressionOptions||a.compressionOptions||{},n=e.dir,s=e.date;e._compressWorker(r,i).withStreamInfo("file",{name:t,dir:n,date:s,comment:e.comment||"",unixPermissions:e.unixPermissions,dosPermissions:e.dosPermissions}).pipe(o)}),o.entriesCount=h}catch(t){o.error(t)}return o}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(t,e,r){"use strict";function i(){if(!(this instanceof i))return new i;if(arguments.length)throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");this.files={},this.comment=null,this.root="",this.clone=function(){var t=new i;for(var e in this)"function"!=typeof this[e]&&(t[e]=this[e]);return t}}(i.prototype=t("./object")).loadAsync=t("./load"),i.support=t("./support"),i.defaults=t("./defaults"),i.version="3.5.0",i.loadAsync=function(t,e){return(new i).loadAsync(t,e)},i.external=t("./external"),e.exports=i},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(t,e,r){"use strict";var i=t("./utils"),n=t("./external"),o=t("./utf8"),h=(i=t("./utils"),t("./zipEntries")),s=t("./stream/Crc32Probe"),u=t("./nodejsUtils");function l(i){return new n.Promise(function(t,e){var r=i.decompressed.getContentWorker().pipe(new s);r.on("error",function(t){e(t)}).on("end",function(){r.streamInfo.crc32!==i.decompressed.crc32?e(new Error("Corrupted zip : CRC32 mismatch")):t()}).resume()})}e.exports=function(t,s){var a=this;return s=i.extend(s||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:o.utf8decode}),u.isNode&&u.isStream(t)?n.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):i.prepareContent("the loaded zip file",t,!0,s.optimizedBinaryString,s.base64).then(function(t){var e=new h(s);return e.load(t),e}).then(function(t){var e=[n.Promise.resolve(t)],r=t.files;if(s.checkCRC32)for(var i=0;i<r.length;i++)e.push(l(r[i]));return n.Promise.all(e)}).then(function(t){for(var e=t.shift(),r=e.files,i=0;i<r.length;i++){var n=r[i];a.file(n.fileNameStr,n.decompressed,{binary:!0,optimizedBinaryString:!0,date:n.date,dir:n.dir,comment:n.fileCommentStr.length?n.fileCommentStr:null,unixPermissions:n.unixPermissions,dosPermissions:n.dosPermissions,createFolders:s.createFolders})}return e.zipComment.length&&(a.comment=e.zipComment),a})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(t,e,r){"use strict";var i=t("../utils"),n=t("../stream/GenericWorker");function s(t,e){n.call(this,"Nodejs stream input adapter for "+t),this._upstreamEnded=!1,this._bindStream(e)}i.inherits(s,n),s.prototype._bindStream=function(t){var e=this;(this._stream=t).pause(),t.on("data",function(t){e.push({data:t,meta:{percent:0}})}).on("error",function(t){e.isPaused?this.generatedError=t:e.error(t)}).on("end",function(){e.isPaused?e._upstreamEnded=!0:e.end()})},s.prototype.pause=function(){return!!n.prototype.pause.call(this)&&(this._stream.pause(),!0)},s.prototype.resume=function(){return!!n.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},e.exports=s},{"../stream/GenericWorker":28,"../utils":32}],13:[function(t,e,r){"use strict";var n=t("readable-stream").Readable;function i(t,e,r){n.call(this,e),this._helper=t;var i=this;t.on("data",function(t,e){i.push(t)||i._helper.pause(),r&&r(e)}).on("error",function(t){i.emit("error",t)}).on("end",function(){i.push(null)})}t("../utils").inherits(i,n),i.prototype._read=function(){this._helper.resume()},e.exports=i},{"../utils":32,"readable-stream":16}],14:[function(t,e,r){"use strict";e.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(t,e){if(Buffer.from&&Buffer.from!==Uint8Array.from)return Buffer.from(t,e);if("number"==typeof t)throw new Error('The "data" argument must not be a number');return new Buffer(t,e)},allocBuffer:function(t){if(Buffer.alloc)return Buffer.alloc(t);var e=new Buffer(t);return e.fill(0),e},isBuffer:function(t){return Buffer.isBuffer(t)},isStream:function(t){return t&&"function"==typeof t.on&&"function"==typeof t.pause&&"function"==typeof t.resume}}},{}],15:[function(t,e,r){"use strict";function s(t,e,r){var i,n=u.getTypeOf(e),s=u.extend(r||{},f);s.date=s.date||new Date,null!==s.compression&&(s.compression=s.compression.toUpperCase()),"string"==typeof s.unixPermissions&&(s.unixPermissions=parseInt(s.unixPermissions,8)),s.unixPermissions&&16384&s.unixPermissions&&(s.dir=!0),s.dosPermissions&&16&s.dosPermissions&&(s.dir=!0),s.dir&&(t=g(t)),s.createFolders&&(i=_(t))&&b.call(this,i,!0);var a="string"===n&&!1===s.binary&&!1===s.base64;r&&void 0!==r.binary||(s.binary=!a),(e instanceof d&&0===e.uncompressedSize||s.dir||!e||0===e.length)&&(s.base64=!1,s.binary=!0,e="",s.compression="STORE",n="string");var o=null;o=e instanceof d||e instanceof l?e:p.isNode&&p.isStream(e)?new m(t,e):u.prepareContent(t,e,s.binary,s.optimizedBinaryString,s.base64);var h=new c(t,o,s);this.files[t]=h}var n=t("./utf8"),u=t("./utils"),l=t("./stream/GenericWorker"),a=t("./stream/StreamHelper"),f=t("./defaults"),d=t("./compressedObject"),c=t("./zipObject"),o=t("./generate"),p=t("./nodejsUtils"),m=t("./nodejs/NodejsStreamInputAdapter"),_=function(t){"/"===t.slice(-1)&&(t=t.substring(0,t.length-1));var e=t.lastIndexOf("/");return 0<e?t.substring(0,e):""},g=function(t){return"/"!==t.slice(-1)&&(t+="/"),t},b=function(t,e){return e=void 0!==e?e:f.createFolders,t=g(t),this.files[t]||s.call(this,t,null,{dir:!0,createFolders:e}),this.files[t]};function h(t){return"[object RegExp]"===Object.prototype.toString.call(t)}var i={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(t){var e,r,i;for(e in this.files)this.files.hasOwnProperty(e)&&(i=this.files[e],(r=e.slice(this.root.length,e.length))&&e.slice(0,this.root.length)===this.root&&t(r,i))},filter:function(r){var i=[];return this.forEach(function(t,e){r(t,e)&&i.push(e)}),i},file:function(t,e,r){if(1!==arguments.length)return t=this.root+t,s.call(this,t,e,r),this;if(h(t)){var i=t;return this.filter(function(t,e){return!e.dir&&i.test(t)})}var n=this.files[this.root+t];return n&&!n.dir?n:null},folder:function(r){if(!r)return this;if(h(r))return this.filter(function(t,e){return e.dir&&r.test(t)});var t=this.root+r,e=b.call(this,t),i=this.clone();return i.root=e.name,i},remove:function(r){r=this.root+r;var t=this.files[r];if(t||("/"!==r.slice(-1)&&(r+="/"),t=this.files[r]),t&&!t.dir)delete this.files[r];else for(var e=this.filter(function(t,e){return e.name.slice(0,r.length)===r}),i=0;i<e.length;i++)delete this.files[e[i].name];return this},generate:function(t){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(t){var e,r={};try{if((r=u.extend(t||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:n.utf8encode})).type=r.type.toLowerCase(),r.compression=r.compression.toUpperCase(),"binarystring"===r.type&&(r.type="string"),!r.type)throw new Error("No output type specified.");u.checkSupport(r.type),"darwin"!==r.platform&&"freebsd"!==r.platform&&"linux"!==r.platform&&"sunos"!==r.platform||(r.platform="UNIX"),"win32"===r.platform&&(r.platform="DOS");var i=r.comment||this.comment||"";e=o.generateWorker(this,r,i)}catch(t){(e=new l("error")).error(t)}return new a(e,r.type||"string",r.mimeType)},generateAsync:function(t,e){return this.generateInternalStream(t).accumulate(e)},generateNodeStream:function(t,e){return(t=t||{}).type||(t.type="nodebuffer"),this.generateInternalStream(t).toNodejsStream(e)}};e.exports=i},{"./compressedObject":2,"./defaults":5,"./generate":9,"./nodejs/NodejsStreamInputAdapter":12,"./nodejsUtils":14,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31,"./utils":32,"./zipObject":35}],16:[function(t,e,r){e.exports=t("stream")},{stream:void 0}],17:[function(t,e,r){"use strict";var i=t("./DataReader");function n(t){i.call(this,t);for(var e=0;e<this.data.length;e++)t[e]=255&t[e]}t("../utils").inherits(n,i),n.prototype.byteAt=function(t){return this.data[this.zero+t]},n.prototype.lastIndexOfSignature=function(t){for(var e=t.charCodeAt(0),r=t.charCodeAt(1),i=t.charCodeAt(2),n=t.charCodeAt(3),s=this.length-4;0<=s;--s)if(this.data[s]===e&&this.data[s+1]===r&&this.data[s+2]===i&&this.data[s+3]===n)return s-this.zero;return-1},n.prototype.readAndCheckSignature=function(t){var e=t.charCodeAt(0),r=t.charCodeAt(1),i=t.charCodeAt(2),n=t.charCodeAt(3),s=this.readData(4);return e===s[0]&&r===s[1]&&i===s[2]&&n===s[3]},n.prototype.readData=function(t){if(this.checkOffset(t),0===t)return[];var e=this.data.slice(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./DataReader":18}],18:[function(t,e,r){"use strict";var i=t("../utils");function n(t){this.data=t,this.length=t.length,this.index=0,this.zero=0}n.prototype={checkOffset:function(t){this.checkIndex(this.index+t)},checkIndex:function(t){if(this.length<this.zero+t||t<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+t+"). Corrupted zip ?")},setIndex:function(t){this.checkIndex(t),this.index=t},skip:function(t){this.setIndex(this.index+t)},byteAt:function(t){},readInt:function(t){var e,r=0;for(this.checkOffset(t),e=this.index+t-1;e>=this.index;e--)r=(r<<8)+this.byteAt(e);return this.index+=t,r},readString:function(t){return i.transformTo("string",this.readData(t))},readData:function(t){},lastIndexOfSignature:function(t){},readAndCheckSignature:function(t){},readDate:function(){var t=this.readInt(4);return new Date(Date.UTC(1980+(t>>25&127),(t>>21&15)-1,t>>16&31,t>>11&31,t>>5&63,(31&t)<<1))}},e.exports=n},{"../utils":32}],19:[function(t,e,r){"use strict";var i=t("./Uint8ArrayReader");function n(t){i.call(this,t)}t("../utils").inherits(n,i),n.prototype.readData=function(t){this.checkOffset(t);var e=this.data.slice(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(t,e,r){"use strict";var i=t("./DataReader");function n(t){i.call(this,t)}t("../utils").inherits(n,i),n.prototype.byteAt=function(t){return this.data.charCodeAt(this.zero+t)},n.prototype.lastIndexOfSignature=function(t){return this.data.lastIndexOf(t)-this.zero},n.prototype.readAndCheckSignature=function(t){return t===this.readData(4)},n.prototype.readData=function(t){this.checkOffset(t);var e=this.data.slice(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./DataReader":18}],21:[function(t,e,r){"use strict";var i=t("./ArrayReader");function n(t){i.call(this,t)}t("../utils").inherits(n,i),n.prototype.readData=function(t){if(this.checkOffset(t),0===t)return new Uint8Array(0);var e=this.data.subarray(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./ArrayReader":17}],22:[function(t,e,r){"use strict";var i=t("../utils"),n=t("../support"),s=t("./ArrayReader"),a=t("./StringReader"),o=t("./NodeBufferReader"),h=t("./Uint8ArrayReader");e.exports=function(t){var e=i.getTypeOf(t);return i.checkSupport(e),"string"!==e||n.uint8array?"nodebuffer"===e?new o(t):n.uint8array?new h(i.transformTo("uint8array",t)):new s(i.transformTo("array",t)):new a(t)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(t,e,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK
",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(t,e,r){"use strict";var i=t("./GenericWorker"),n=t("../utils");function s(t){i.call(this,"ConvertWorker to "+t),this.destType=t}n.inherits(s,i),s.prototype.processChunk=function(t){this.push({data:n.transformTo(this.destType,t.data),meta:t.meta})},e.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(t,e,r){"use strict";var i=t("./GenericWorker"),n=t("../crc32");function s(){i.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}t("../utils").inherits(s,i),s.prototype.processChunk=function(t){this.streamInfo.crc32=n(t.data,this.streamInfo.crc32||0),this.push(t)},e.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(t,e,r){"use strict";var i=t("../utils"),n=t("./GenericWorker");function s(t){n.call(this,"DataLengthProbe for "+t),this.propName=t,this.withStreamInfo(t,0)}i.inherits(s,n),s.prototype.processChunk=function(t){if(t){var e=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=e+t.data.length}n.prototype.processChunk.call(this,t)},e.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(t,e,r){"use strict";var i=t("../utils"),n=t("./GenericWorker");function s(t){n.call(this,"DataWorker");var e=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,t.then(function(t){e.dataIsReady=!0,e.data=t,e.max=t&&t.length||0,e.type=i.getTypeOf(t),e.isPaused||e._tickAndRepeat()},function(t){e.error(t)})}i.inherits(s,n),s.prototype.cleanUp=function(){n.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!n.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,i.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(i.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var t=null,e=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":t=this.data.substring(this.index,e);break;case"uint8array":t=this.data.subarray(this.index,e);break;case"array":case"nodebuffer":t=this.data.slice(this.index,e)}return this.index=e,this.push({data:t,meta:{percent:this.max?this.index/this.max*100:0}})},e.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(t,e,r){"use strict";function i(t){this.name=t||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}i.prototype={push:function(t){this.emit("data",t)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(t){this.emit("error",t)}return!0},error:function(t){return!this.isFinished&&(this.isPaused?this.generatedError=t:(this.isFinished=!0,this.emit("error",t),this.previous&&this.previous.error(t),this.cleanUp()),!0)},on:function(t,e){return this._listeners[t].push(e),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(t,e){if(this._listeners[t])for(var r=0;r<this._listeners[t].length;r++)this._listeners[t][r].call(this,e)},pipe:function(t){return t.registerPrevious(this)},registerPrevious:function(t){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=t.streamInfo,this.mergeStreamInfo(),this.previous=t;var e=this;return t.on("data",function(t){e.processChunk(t)}),t.on("end",function(){e.end()}),t.on("error",function(t){e.error(t)}),this},pause:function(){return!this.isPaused&&!this.isFinished&&(this.isPaused=!0,this.previous&&this.previous.pause(),!0)},resume:function(){if(!this.isPaused||this.isFinished)return!1;var t=this.isPaused=!1;return this.generatedError&&(this.error(this.generatedError),t=!0),this.previous&&this.previous.resume(),!t},flush:function(){},processChunk:function(t){this.push(t)},withStreamInfo:function(t,e){return this.extraStreamInfo[t]=e,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var t in this.extraStreamInfo)this.extraStreamInfo.hasOwnProperty(t)&&(this.streamInfo[t]=this.extraStreamInfo[t])},lock:function(){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.isLocked=!0,this.previous&&this.previous.lock()},toString:function(){var t="Worker "+this.name;return this.previous?this.previous+" -> "+t:t}},e.exports=i},{}],29:[function(t,e,r){"use strict";var h=t("../utils"),n=t("./ConvertWorker"),s=t("./GenericWorker"),u=t("../base64"),i=t("../support"),a=t("../external"),o=null;if(i.nodestream)try{o=t("../nodejs/NodejsStreamOutputAdapter")}catch(t){}function l(t,o){return new a.Promise(function(e,r){var i=[],n=t._internalType,s=t._outputType,a=t._mimeType;t.on("data",function(t,e){i.push(t),o&&o(e)}).on("error",function(t){i=[],r(t)}).on("end",function(){try{var t=function(t,e,r){switch(t){case"blob":return h.newBlob(h.transformTo("arraybuffer",e),r);case"base64":return u.encode(e);default:return h.transformTo(t,e)}}(s,function(t,e){var r,i=0,n=null,s=0;for(r=0;r<e.length;r++)s+=e[r].length;switch(t){case"string":return e.join("");case"array":return Array.prototype.concat.apply([],e);case"uint8array":for(n=new Uint8Array(s),r=0;r<e.length;r++)n.set(e[r],i),i+=e[r].length;return n;case"nodebuffer":return Buffer.concat(e);default:throw new Error("concat : unsupported type '"+t+"'")}}(n,i),a);e(t)}catch(t){r(t)}i=[]}).resume()})}function f(t,e,r){var i=e;switch(e){case"blob":case"arraybuffer":i="uint8array";break;case"base64":i="string"}try{this._internalType=i,this._outputType=e,this._mimeType=r,h.checkSupport(i),this._worker=t.pipe(new n(i)),t.lock()}catch(t){this._worker=new s("error"),this._worker.error(t)}}f.prototype={accumulate:function(t){return l(this,t)},on:function(t,e){var r=this;return"data"===t?this._worker.on(t,function(t){e.call(r,t.data,t.meta)}):this._worker.on(t,function(){h.delay(e,arguments,r)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(t){if(h.checkSupport("nodestream"),"nodebuffer"!==this._outputType)throw new Error(this._outputType+" is not supported by this method");return new o(this,{objectMode:"nodebuffer"!==this._outputType},t)}},e.exports=f},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(t,e,r){"use strict";if(r.base64=!0,r.array=!0,r.string=!0,r.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,r.nodebuffer="undefined"!=typeof Buffer,r.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)r.blob=!1;else{var i=new ArrayBuffer(0);try{r.blob=0===new Blob([i],{type:"application/zip"}).size}catch(t){try{var n=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);n.append(i),r.blob=0===n.getBlob("application/zip").size}catch(t){r.blob=!1}}}try{r.nodestream=!!t("readable-stream").Readable}catch(t){r.nodestream=!1}},{"readable-stream":16}],31:[function(t,e,s){"use strict";for(var o=t("./utils"),h=t("./support"),r=t("./nodejsUtils"),i=t("./stream/GenericWorker"),u=new Array(256),n=0;n<256;n++)u[n]=252<=n?6:248<=n?5:240<=n?4:224<=n?3:192<=n?2:1;u[254]=u[254]=1;function a(){i.call(this,"utf-8 decode"),this.leftOver=null}function l(){i.call(this,"utf-8 encode")}s.utf8encode=function(t){return h.nodebuffer?r.newBufferFrom(t,"utf-8"):function(t){var e,r,i,n,s,a=t.length,o=0;for(n=0;n<a;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),o+=r<128?1:r<2048?2:r<65536?3:4;for(e=h.uint8array?new Uint8Array(o):new Array(o),n=s=0;s<o;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),r<128?e[s++]=r:(r<2048?e[s++]=192|r>>>6:(r<65536?e[s++]=224|r>>>12:(e[s++]=240|r>>>18,e[s++]=128|r>>>12&63),e[s++]=128|r>>>6&63),e[s++]=128|63&r);return e}(t)},s.utf8decode=function(t){return h.nodebuffer?o.transformTo("nodebuffer",t).toString("utf-8"):function(t){var e,r,i,n,s=t.length,a=new Array(2*s);for(e=r=0;e<s;)if((i=t[e++])<128)a[r++]=i;else if(4<(n=u[i]))a[r++]=65533,e+=n-1;else{for(i&=2===n?31:3===n?15:7;1<n&&e<s;)i=i<<6|63&t[e++],n--;1<n?a[r++]=65533:i<65536?a[r++]=i:(i-=65536,a[r++]=55296|i>>10&1023,a[r++]=56320|1023&i)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(t=o.transformTo(h.uint8array?"uint8array":"array",t))},o.inherits(a,i),a.prototype.processChunk=function(t){var e=o.transformTo(h.uint8array?"uint8array":"array",t.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=e;(e=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),e.set(r,this.leftOver.length)}else e=this.leftOver.concat(e);this.leftOver=null}var i=function(t,e){var r;for((e=e||t.length)>t.length&&(e=t.length),r=e-1;0<=r&&128==(192&t[r]);)r--;return r<0?e:0===r?e:r+u[t[r]]>e?r:e}(e),n=e;i!==e.length&&(h.uint8array?(n=e.subarray(0,i),this.leftOver=e.subarray(i,e.length)):(n=e.slice(0,i),this.leftOver=e.slice(i,e.length))),this.push({data:s.utf8decode(n),meta:t.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,i),l.prototype.processChunk=function(t){this.push({data:s.utf8encode(t.data),meta:t.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(t,e,a){"use strict";var o=t("./support"),h=t("./base64"),r=t("./nodejsUtils"),i=t("set-immediate-shim"),u=t("./external");function n(t){return t}function l(t,e){for(var r=0;r<t.length;++r)e[r]=255&t.charCodeAt(r);return e}a.newBlob=function(e,r){a.checkSupport("blob");try{return new Blob([e],{type:r})}catch(t){try{var i=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);return i.append(e),i.getBlob(r)}catch(t){throw new Error("Bug : can't construct the Blob.")}}};var s={stringifyByChunk:function(t,e,r){var i=[],n=0,s=t.length;if(s<=r)return String.fromCharCode.apply(null,t);for(;n<s;)"array"===e||"nodebuffer"===e?i.push(String.fromCharCode.apply(null,t.slice(n,Math.min(n+r,s)))):i.push(String.fromCharCode.apply(null,t.subarray(n,Math.min(n+r,s)))),n+=r;return i.join("")},stringifyByChar:function(t){for(var e="",r=0;r<t.length;r++)e+=String.fromCharCode(t[r]);return e},applyCanBeUsed:{uint8array:function(){try{return o.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(t){return!1}}(),nodebuffer:function(){try{return o.nodebuffer&&1===String.fromCharCode.apply(null,r.allocBuffer(1)).length}catch(t){return!1}}()}};function f(t){var e=65536,r=a.getTypeOf(t),i=!0;if("uint8array"===r?i=s.applyCanBeUsed.uint8array:"nodebuffer"===r&&(i=s.applyCanBeUsed.nodebuffer),i)for(;1<e;)try{return s.stringifyByChunk(t,r,e)}catch(t){e=Math.floor(e/2)}return s.stringifyByChar(t)}function d(t,e){for(var r=0;r<t.length;r++)e[r]=t[r];return e}a.applyFromCharCode=f;var c={};c.string={string:n,array:function(t){return l(t,new Array(t.length))},arraybuffer:function(t){return c.string.uint8array(t).buffer},uint8array:function(t){return l(t,new Uint8Array(t.length))},nodebuffer:function(t){return l(t,r.allocBuffer(t.length))}},c.array={string:f,array:n,arraybuffer:function(t){return new Uint8Array(t).buffer},uint8array:function(t){return new Uint8Array(t)},nodebuffer:function(t){return r.newBufferFrom(t)}},c.arraybuffer={string:function(t){return f(new Uint8Array(t))},array:function(t){return d(new Uint8Array(t),new Array(t.byteLength))},arraybuffer:n,uint8array:function(t){return new Uint8Array(t)},nodebuffer:function(t){return r.newBufferFrom(new Uint8Array(t))}},c.uint8array={string:f,array:function(t){return d(t,new Array(t.length))},arraybuffer:function(t){return t.buffer},uint8array:n,nodebuffer:function(t){return r.newBufferFrom(t)}},c.nodebuffer={string:f,array:function(t){return d(t,new Array(t.length))},arraybuffer:function(t){return c.nodebuffer.uint8array(t).buffer},uint8array:function(t){return d(t,new Uint8Array(t.length))},nodebuffer:n},a.transformTo=function(t,e){if(e=e||"",!t)return e;a.checkSupport(t);var r=a.getTypeOf(e);return c[r][t](e)},a.getTypeOf=function(t){return"string"==typeof t?"string":"[object Array]"===Object.prototype.toString.call(t)?"array":o.nodebuffer&&r.isBuffer(t)?"nodebuffer":o.uint8array&&t instanceof Uint8Array?"uint8array":o.arraybuffer&&t instanceof ArrayBuffer?"arraybuffer":void 0},a.checkSupport=function(t){if(!o[t.toLowerCase()])throw new Error(t+" is not supported by this platform")},a.MAX_VALUE_16BITS=65535,a.MAX_VALUE_32BITS=-1,a.pretty=function(t){var e,r,i="";for(r=0;r<(t||"").length;r++)i+="\\x"+((e=t.charCodeAt(r))<16?"0":"")+e.toString(16).toUpperCase();return i},a.delay=function(t,e,r){i(function(){t.apply(r||null,e||[])})},a.inherits=function(t,e){function r(){}r.prototype=e.prototype,t.prototype=new r},a.extend=function(){var t,e,r={};for(t=0;t<arguments.length;t++)for(e in arguments[t])arguments[t].hasOwnProperty(e)&&void 0===r[e]&&(r[e]=arguments[t][e]);return r},a.prepareContent=function(r,t,i,n,s){return u.Promise.resolve(t).then(function(i){return o.blob&&(i instanceof Blob||-1!==["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(i)))&&"undefined"!=typeof FileReader?new u.Promise(function(e,r){var t=new FileReader;t.onload=function(t){e(t.target.result)},t.onerror=function(t){r(t.target.error)},t.readAsArrayBuffer(i)}):i}).then(function(t){var e=a.getTypeOf(t);return e?("arraybuffer"===e?t=a.transformTo("uint8array",t):"string"===e&&(s?t=h.decode(t):i&&!0!==n&&(t=function(t){return l(t,o.uint8array?new Uint8Array(t.length):new Array(t.length))}(t))),t):u.Promise.reject(new Error("Can't read the data of '"+r+"'. Is it in a supported JavaScript type (String, Blob, ArrayBuffer, etc) ?"))})}},{"./base64":1,"./external":6,"./nodejsUtils":14,"./support":30,"set-immediate-shim":54}],33:[function(t,e,r){"use strict";var i=t("./reader/readerFor"),n=t("./utils"),s=t("./signature"),a=t("./zipEntry"),o=(t("./utf8"),t("./support"));function h(t){this.files=[],this.loadOptions=t}h.prototype={checkSignature:function(t){if(!this.reader.readAndCheckSignature(t)){this.reader.index-=4;var e=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+n.pretty(e)+", expected "+n.pretty(t)+")")}},isSignature:function(t,e){var r=this.reader.index;this.reader.setIndex(t);var i=this.reader.readString(4)===e;return this.reader.setIndex(r),i},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2);var t=this.reader.readData(this.zipCommentLength),e=o.uint8array?"uint8array":"array",r=n.transformTo(e,t);this.zipComment=this.loadOptions.decodeFileName(r)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.reader.skip(4),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var t,e,r,i=this.zip64EndOfCentralSize-44;0<i;)t=this.reader.readInt(2),e=this.reader.readInt(4),r=this.reader.readData(e),this.zip64ExtensibleData[t]={id:t,length:e,value:r}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),1<this.disksCount)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var t,e;for(t=0;t<this.files.length;t++)e=this.files[t],this.reader.setIndex(e.localHeaderOffset),this.checkSignature(s.LOCAL_FILE_HEADER),e.readLocalPart(this.reader),e.handleUTF8(),e.processAttributes()},readCentralDir:function(){var t;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(s.CENTRAL_FILE_HEADER);)(t=new a({zip64:this.zip64},this.loadOptions)).readCentralPart(this.reader),this.files.push(t);if(this.centralDirRecords!==this.files.length&&0!==this.centralDirRecords&&0===this.files.length)throw new Error("Corrupted zip or bug: expected "+this.centralDirRecords+" records in central dir, got "+this.files.length)},readEndOfCentral:function(){var t=this.reader.lastIndexOfSignature(s.CENTRAL_DIRECTORY_END);if(t<0)throw!this.isSignature(0,s.LOCAL_FILE_HEADER)?new Error("Can't find end of central directory : is this a zip file ? If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html"):new Error("Corrupted zip: can't find end of central directory");this.reader.setIndex(t);var e=t;if(this.checkSignature(s.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===n.MAX_VALUE_16BITS||this.diskWithCentralDirStart===n.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===n.MAX_VALUE_16BITS||this.centralDirRecords===n.MAX_VALUE_16BITS||this.centralDirSize===n.MAX_VALUE_32BITS||this.centralDirOffset===n.MAX_VALUE_32BITS){if(this.zip64=!0,(t=this.reader.lastIndexOfSignature(s.ZIP64_CENTRAL_DIRECTORY_LOCATOR))<0)throw new Error("Corrupted zip: can't find the ZIP64 end of central directory locator");if(this.reader.setIndex(t),this.checkSignature(s.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),!this.isSignature(this.relativeOffsetEndOfZip64CentralDir,s.ZIP64_CENTRAL_DIRECTORY_END)&&(this.relativeOffsetEndOfZip64CentralDir=this.reader.lastIndexOfSignature(s.ZIP64_CENTRAL_DIRECTORY_END),this.relativeOffsetEndOfZip64CentralDir<0))throw new Error("Corrupted zip: can't find the ZIP64 end of central directory");this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(s.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}var r=this.centralDirOffset+this.centralDirSize;this.zip64&&(r+=20,r+=12+this.zip64EndOfCentralSize);var i=e-r;if(0<i)this.isSignature(e,s.CENTRAL_FILE_HEADER)||(this.reader.zero=i);else if(i<0)throw new Error("Corrupted zip: missing "+Math.abs(i)+" bytes.")},prepareReader:function(t){this.reader=i(t)},load:function(t){this.prepareReader(t),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},e.exports=h},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utf8":31,"./utils":32,"./zipEntry":34}],34:[function(t,e,r){"use strict";var i=t("./reader/readerFor"),s=t("./utils"),n=t("./compressedObject"),a=t("./crc32"),o=t("./utf8"),h=t("./compressions"),u=t("./support");function l(t,e){this.options=t,this.loadOptions=e}l.prototype={isEncrypted:function(){return 1==(1&this.bitFlag)},useUTF8:function(){return 2048==(2048&this.bitFlag)},readLocalPart:function(t){var e,r;if(t.skip(22),this.fileNameLength=t.readInt(2),r=t.readInt(2),this.fileName=t.readData(this.fileNameLength),t.skip(r),-1===this.compressedSize||-1===this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough information from the central directory (compressedSize === -1 || uncompressedSize === -1)");if(null===(e=function(t){for(var e in h)if(h.hasOwnProperty(e)&&h[e].magic===t)return h[e];return null}(this.compressionMethod)))throw new Error("Corrupted zip : compression "+s.pretty(this.compressionMethod)+" unknown (inner file : "+s.transformTo("string",this.fileName)+")");this.decompressed=new n(this.compressedSize,this.uncompressedSize,this.crc32,e,t.readData(this.compressedSize))},readCentralPart:function(t){this.versionMadeBy=t.readInt(2),t.skip(2),this.bitFlag=t.readInt(2),this.compressionMethod=t.readString(2),this.date=t.readDate(),this.crc32=t.readInt(4),this.compressedSize=t.readInt(4),this.uncompressedSize=t.readInt(4);var e=t.readInt(2);if(this.extraFieldsLength=t.readInt(2),this.fileCommentLength=t.readInt(2),this.diskNumberStart=t.readInt(2),this.internalFileAttributes=t.readInt(2),this.externalFileAttributes=t.readInt(4),this.localHeaderOffset=t.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");t.skip(e),this.readExtraFields(t),this.parseZIP64ExtraField(t),this.fileComment=t.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var t=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),0==t&&(this.dosPermissions=63&this.externalFileAttributes),3==t&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(t){if(this.extraFields[1]){var e=i(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(t){var e,r,i,n=t.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});t.index+4<n;)e=t.readInt(2),r=t.readInt(2),i=t.readData(r),this.extraFields[e]={id:e,length:r,value:i};t.setIndex(n)},handleUTF8:function(){var t=u.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=o.utf8decode(this.fileName),this.fileCommentStr=o.utf8decode(this.fileComment);else{var e=this.findExtraFieldUnicodePath();if(null!==e)this.fileNameStr=e;else{var r=s.transformTo(t,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(r)}var i=this.findExtraFieldUnicodeComment();if(null!==i)this.fileCommentStr=i;else{var n=s.transformTo(t,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(n)}}},findExtraFieldUnicodePath:function(){var t=this.extraFields[28789];if(t){var e=i(t.value);return 1!==e.readInt(1)?null:a(this.fileName)!==e.readInt(4)?null:o.utf8decode(e.readData(t.length-5))}return null},findExtraFieldUnicodeComment:function(){var t=this.extraFields[25461];if(t){var e=i(t.value);return 1!==e.readInt(1)?null:a(this.fileComment)!==e.readInt(4)?null:o.utf8decode(e.readData(t.length-5))}return null}},e.exports=l},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(t,e,r){"use strict";function i(t,e,r){this.name=t,this.dir=r.dir,this.date=r.date,this.comment=r.comment,this.unixPermissions=r.unixPermissions,this.dosPermissions=r.dosPermissions,this._data=e,this._dataBinary=r.binary,this.options={compression:r.compression,compressionOptions:r.compressionOptions}}var s=t("./stream/StreamHelper"),n=t("./stream/DataWorker"),a=t("./utf8"),o=t("./compressedObject"),h=t("./stream/GenericWorker");i.prototype={internalStream:function(t){var e=null,r="string";try{if(!t)throw new Error("No output type specified.");var i="string"===(r=t.toLowerCase())||"text"===r;"binarystring"!==r&&"text"!==r||(r="string"),e=this._decompressWorker();var n=!this._dataBinary;n&&!i&&(e=e.pipe(new a.Utf8EncodeWorker)),!n&&i&&(e=e.pipe(new a.Utf8DecodeWorker))}catch(t){(e=new h("error")).error(t)}return new s(e,r,"")},async:function(t,e){return this.internalStream(t).accumulate(e)},nodeStream:function(t,e){return this.internalStream(t||"nodebuffer").toNodejsStream(e)},_compressWorker:function(t,e){if(this._data instanceof o&&this._data.compression.magic===t.magic)return this._data.getCompressedWorker();var r=this._decompressWorker();return this._dataBinary||(r=r.pipe(new a.Utf8EncodeWorker)),o.createWorkerFrom(r,t,e)},_decompressWorker:function(){return this._data instanceof o?this._data.getContentWorker():this._data instanceof h?this._data:new n(this._data)}};for(var u=["asText","asBinary","asNodeBuffer","asUint8Array","asArrayBuffer"],l=function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},f=0;f<u.length;f++)i.prototype[u[f]]=l;e.exports=i},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(t,l,e){(function(e){"use strict";var r,i,t=e.MutationObserver||e.WebKitMutationObserver;if(t){var n=0,s=new t(u),a=e.document.createTextNode("");s.observe(a,{characterData:!0}),r=function(){a.data=n=++n%2}}else if(e.setImmediate||void 0===e.MessageChannel)r="document"in e&&"onreadystatechange"in e.document.createElement("script")?function(){var t=e.document.createElement("script");t.onreadystatechange=function(){u(),t.onreadystatechange=null,t.parentNode.removeChild(t),t=null},e.document.documentElement.appendChild(t)}:function(){setTimeout(u,0)};else{var o=new e.MessageChannel;o.port1.onmessage=u,r=function(){o.port2.postMessage(0)}}var h=[];function u(){var t,e;i=!0;for(var r=h.length;r;){for(e=h,h=[],t=-1;++t<r;)e[t]();r=h.length}i=!1}l.exports=function(t){1!==h.push(t)||i||r()}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],37:[function(t,e,r){"use strict";var n=t("immediate");function u(){}var l={},s=["REJECTED"],a=["FULFILLED"],i=["PENDING"];function o(t){if("function"!=typeof t)throw new TypeError("resolver must be a function");this.state=i,this.queue=[],this.outcome=void 0,t!==u&&c(this,t)}function h(t,e,r){this.promise=t,"function"==typeof e&&(this.onFulfilled=e,this.callFulfilled=this.otherCallFulfilled),"function"==typeof r&&(this.onRejected=r,this.callRejected=this.otherCallRejected)}function f(e,r,i){n(function(){var t;try{t=r(i)}catch(t){return l.reject(e,t)}t===e?l.reject(e,new TypeError("Cannot resolve promise with itself")):l.resolve(e,t)})}function d(t){var e=t&&t.then;if(t&&("object"==typeof t||"function"==typeof t)&&"function"==typeof e)return function(){e.apply(t,arguments)}}function c(e,t){var r=!1;function i(t){r||(r=!0,l.reject(e,t))}function n(t){r||(r=!0,l.resolve(e,t))}var s=p(function(){t(n,i)});"error"===s.status&&i(s.value)}function p(t,e){var r={};try{r.value=t(e),r.status="success"}catch(t){r.status="error",r.value=t}return r}(e.exports=o).prototype.finally=function(e){if("function"!=typeof e)return this;var r=this.constructor;return this.then(function(t){return r.resolve(e()).then(function(){return t})},function(t){return r.resolve(e()).then(function(){throw t})})},o.prototype.catch=function(t){return this.then(null,t)},o.prototype.then=function(t,e){if("function"!=typeof t&&this.state===a||"function"!=typeof e&&this.state===s)return this;var r=new this.constructor(u);this.state!==i?f(r,this.state===a?t:e,this.outcome):this.queue.push(new h(r,t,e));return r},h.prototype.callFulfilled=function(t){l.resolve(this.promise,t)},h.prototype.otherCallFulfilled=function(t){f(this.promise,this.onFulfilled,t)},h.prototype.callRejected=function(t){l.reject(this.promise,t)},h.prototype.otherCallRejected=function(t){f(this.promise,this.onRejected,t)},l.resolve=function(t,e){var r=p(d,e);if("error"===r.status)return l.reject(t,r.value);var i=r.value;if(i)c(t,i);else{t.state=a,t.outcome=e;for(var n=-1,s=t.queue.length;++n<s;)t.queue[n].callFulfilled(e)}return t},l.reject=function(t,e){t.state=s,t.outcome=e;for(var r=-1,i=t.queue.length;++r<i;)t.queue[r].callRejected(e);return t},o.resolve=function(t){if(t instanceof this)return t;return l.resolve(new this(u),t)},o.reject=function(t){var e=new this(u);return l.reject(e,t)},o.all=function(t){var r=this;if("[object Array]"!==Object.prototype.toString.call(t))return this.reject(new TypeError("must be an array"));var i=t.length,n=!1;if(!i)return this.resolve([]);var s=new Array(i),a=0,e=-1,o=new this(u);for(;++e<i;)h(t[e],e);return o;function h(t,e){r.resolve(t).then(function(t){s[e]=t,++a!==i||n||(n=!0,l.resolve(o,s))},function(t){n||(n=!0,l.reject(o,t))})}},o.race=function(t){var e=this;if("[object Array]"!==Object.prototype.toString.call(t))return this.reject(new TypeError("must be an array"));var r=t.length,i=!1;if(!r)return this.resolve([]);var n=-1,s=new this(u);for(;++n<r;)a=t[n],e.resolve(a).then(function(t){i||(i=!0,l.resolve(s,t))},function(t){i||(i=!0,l.reject(s,t))});var a;return s}},{immediate:36}],38:[function(t,e,r){"use strict";var i={};(0,t("./lib/utils/common").assign)(i,t("./lib/deflate"),t("./lib/inflate"),t("./lib/zlib/constants")),e.exports=i},{"./lib/deflate":39,"./lib/inflate":40,"./lib/utils/common":41,"./lib/zlib/constants":44}],39:[function(t,e,r){"use strict";var a=t("./zlib/deflate"),o=t("./utils/common"),h=t("./utils/strings"),n=t("./zlib/messages"),s=t("./zlib/zstream"),u=Object.prototype.toString,l=0,f=-1,d=0,c=8;function p(t){if(!(this instanceof p))return new p(t);this.options=o.assign({level:f,method:c,chunkSize:16384,windowBits:15,memLevel:8,strategy:d,to:""},t||{});var e=this.options;e.raw&&0<e.windowBits?e.windowBits=-e.windowBits:e.gzip&&0<e.windowBits&&e.windowBits<16&&(e.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new s,this.strm.avail_out=0;var r=a.deflateInit2(this.strm,e.level,e.method,e.windowBits,e.memLevel,e.strategy);if(r!==l)throw new Error(n[r]);if(e.header&&a.deflateSetHeader(this.strm,e.header),e.dictionary){var i;if(i="string"==typeof e.dictionary?h.string2buf(e.dictionary):"[object ArrayBuffer]"===u.call(e.dictionary)?new Uint8Array(e.dictionary):e.dictionary,(r=a.deflateSetDictionary(this.strm,i))!==l)throw new Error(n[r]);this._dict_set=!0}}function i(t,e){var r=new p(e);if(r.push(t,!0),r.err)throw r.msg||n[r.err];return r.result}p.prototype.push=function(t,e){var r,i,n=this.strm,s=this.options.chunkSize;if(this.ended)return!1;i=e===~~e?e:!0===e?4:0,"string"==typeof t?n.input=h.string2buf(t):"[object ArrayBuffer]"===u.call(t)?n.input=new Uint8Array(t):n.input=t,n.next_in=0,n.avail_in=n.input.length;do{if(0===n.avail_out&&(n.output=new o.Buf8(s),n.next_out=0,n.avail_out=s),1!==(r=a.deflate(n,i))&&r!==l)return this.onEnd(r),!(this.ended=!0);0!==n.avail_out&&(0!==n.avail_in||4!==i&&2!==i)||("string"===this.options.to?this.onData(h.buf2binstring(o.shrinkBuf(n.output,n.next_out))):this.onData(o.shrinkBuf(n.output,n.next_out)))}while((0<n.avail_in||0===n.avail_out)&&1!==r);return 4===i?(r=a.deflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===l):2!==i||(this.onEnd(l),!(n.avail_out=0))},p.prototype.onData=function(t){this.chunks.push(t)},p.prototype.onEnd=function(t){t===l&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=o.flattenChunks(this.chunks)),this.chunks=[],this.err=t,this.msg=this.strm.msg},r.Deflate=p,r.deflate=i,r.deflateRaw=function(t,e){return(e=e||{}).raw=!0,i(t,e)},r.gzip=function(t,e){return(e=e||{}).gzip=!0,i(t,e)}},{"./utils/common":41,"./utils/strings":42,"./zlib/deflate":46,"./zlib/messages":51,"./zlib/zstream":53}],40:[function(t,e,r){"use strict";var d=t("./zlib/inflate"),c=t("./utils/common"),p=t("./utils/strings"),m=t("./zlib/constants"),i=t("./zlib/messages"),n=t("./zlib/zstream"),s=t("./zlib/gzheader"),_=Object.prototype.toString;function a(t){if(!(this instanceof a))return new a(t);this.options=c.assign({chunkSize:16384,windowBits:0,to:""},t||{});var e=this.options;e.raw&&0<=e.windowBits&&e.windowBits<16&&(e.windowBits=-e.windowBits,0===e.windowBits&&(e.windowBits=-15)),!(0<=e.windowBits&&e.windowBits<16)||t&&t.windowBits||(e.windowBits+=32),15<e.windowBits&&e.windowBits<48&&0==(15&e.windowBits)&&(e.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new n,this.strm.avail_out=0;var r=d.inflateInit2(this.strm,e.windowBits);if(r!==m.Z_OK)throw new Error(i[r]);this.header=new s,d.inflateGetHeader(this.strm,this.header)}function o(t,e){var r=new a(e);if(r.push(t,!0),r.err)throw r.msg||i[r.err];return r.result}a.prototype.push=function(t,e){var r,i,n,s,a,o,h=this.strm,u=this.options.chunkSize,l=this.options.dictionary,f=!1;if(this.ended)return!1;i=e===~~e?e:!0===e?m.Z_FINISH:m.Z_NO_FLUSH,"string"==typeof t?h.input=p.binstring2buf(t):"[object ArrayBuffer]"===_.call(t)?h.input=new Uint8Array(t):h.input=t,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new c.Buf8(u),h.next_out=0,h.avail_out=u),(r=d.inflate(h,m.Z_NO_FLUSH))===m.Z_NEED_DICT&&l&&(o="string"==typeof l?p.string2buf(l):"[object ArrayBuffer]"===_.call(l)?new Uint8Array(l):l,r=d.inflateSetDictionary(this.strm,o)),r===m.Z_BUF_ERROR&&!0===f&&(r=m.Z_OK,f=!1),r!==m.Z_STREAM_END&&r!==m.Z_OK)return this.onEnd(r),!(this.ended=!0);h.next_out&&(0!==h.avail_out&&r!==m.Z_STREAM_END&&(0!==h.avail_in||i!==m.Z_FINISH&&i!==m.Z_SYNC_FLUSH)||("string"===this.options.to?(n=p.utf8border(h.output,h.next_out),s=h.next_out-n,a=p.buf2string(h.output,n),h.next_out=s,h.avail_out=u-s,s&&c.arraySet(h.output,h.output,n,s,0),this.onData(a)):this.onData(c.shrinkBuf(h.output,h.next_out)))),0===h.avail_in&&0===h.avail_out&&(f=!0)}while((0<h.avail_in||0===h.avail_out)&&r!==m.Z_STREAM_END);return r===m.Z_STREAM_END&&(i=m.Z_FINISH),i===m.Z_FINISH?(r=d.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===m.Z_OK):i!==m.Z_SYNC_FLUSH||(this.onEnd(m.Z_OK),!(h.avail_out=0))},a.prototype.onData=function(t){this.chunks.push(t)},a.prototype.onEnd=function(t){t===m.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=c.flattenChunks(this.chunks)),this.chunks=[],this.err=t,this.msg=this.strm.msg},r.Inflate=a,r.inflate=o,r.inflateRaw=function(t,e){return(e=e||{}).raw=!0,o(t,e)},r.ungzip=o},{"./utils/common":41,"./utils/strings":42,"./zlib/constants":44,"./zlib/gzheader":47,"./zlib/inflate":49,"./zlib/messages":51,"./zlib/zstream":53}],41:[function(t,e,r){"use strict";var i="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;r.assign=function(t){for(var e=Array.prototype.slice.call(arguments,1);e.length;){var r=e.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var i in r)r.hasOwnProperty(i)&&(t[i]=r[i])}}return t},r.shrinkBuf=function(t,e){return t.length===e?t:t.subarray?t.subarray(0,e):(t.length=e,t)};var n={arraySet:function(t,e,r,i,n){if(e.subarray&&t.subarray)t.set(e.subarray(r,r+i),n);else for(var s=0;s<i;s++)t[n+s]=e[r+s]},flattenChunks:function(t){var e,r,i,n,s,a;for(e=i=0,r=t.length;e<r;e++)i+=t[e].length;for(a=new Uint8Array(i),e=n=0,r=t.length;e<r;e++)s=t[e],a.set(s,n),n+=s.length;return a}},s={arraySet:function(t,e,r,i,n){for(var s=0;s<i;s++)t[n+s]=e[r+s]},flattenChunks:function(t){return[].concat.apply([],t)}};r.setTyped=function(t){t?(r.Buf8=Uint8Array,r.Buf16=Uint16Array,r.Buf32=Int32Array,r.assign(r,n)):(r.Buf8=Array,r.Buf16=Array,r.Buf32=Array,r.assign(r,s))},r.setTyped(i)},{}],42:[function(t,e,r){"use strict";var h=t("./common"),n=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(t){n=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(t){s=!1}for(var u=new h.Buf8(256),i=0;i<256;i++)u[i]=252<=i?6:248<=i?5:240<=i?4:224<=i?3:192<=i?2:1;function l(t,e){if(e<65537&&(t.subarray&&s||!t.subarray&&n))return String.fromCharCode.apply(null,h.shrinkBuf(t,e));for(var r="",i=0;i<e;i++)r+=String.fromCharCode(t[i]);return r}u[254]=u[254]=1,r.string2buf=function(t){var e,r,i,n,s,a=t.length,o=0;for(n=0;n<a;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),o+=r<128?1:r<2048?2:r<65536?3:4;for(e=new h.Buf8(o),n=s=0;s<o;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),r<128?e[s++]=r:(r<2048?e[s++]=192|r>>>6:(r<65536?e[s++]=224|r>>>12:(e[s++]=240|r>>>18,e[s++]=128|r>>>12&63),e[s++]=128|r>>>6&63),e[s++]=128|63&r);return e},r.buf2binstring=function(t){return l(t,t.length)},r.binstring2buf=function(t){for(var e=new h.Buf8(t.length),r=0,i=e.length;r<i;r++)e[r]=t.charCodeAt(r);return e},r.buf2string=function(t,e){var r,i,n,s,a=e||t.length,o=new Array(2*a);for(r=i=0;r<a;)if((n=t[r++])<128)o[i++]=n;else if(4<(s=u[n]))o[i++]=65533,r+=s-1;else{for(n&=2===s?31:3===s?15:7;1<s&&r<a;)n=n<<6|63&t[r++],s--;1<s?o[i++]=65533:n<65536?o[i++]=n:(n-=65536,o[i++]=55296|n>>10&1023,o[i++]=56320|1023&n)}return l(o,i)},r.utf8border=function(t,e){var r;for((e=e||t.length)>t.length&&(e=t.length),r=e-1;0<=r&&128==(192&t[r]);)r--;return r<0?e:0===r?e:r+u[t[r]]>e?r:e}},{"./common":41}],43:[function(t,e,r){"use strict";e.exports=function(t,e,r,i){for(var n=65535&t|0,s=t>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3<r?2e3:r;s=s+(n=n+e[i++]|0)|0,--a;);n%=65521,s%=65521}return n|s<<16|0}},{}],44:[function(t,e,r){"use strict";e.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],45:[function(t,e,r){"use strict";var o=function(){for(var t,e=[],r=0;r<256;r++){t=r;for(var i=0;i<8;i++)t=1&t?3988292384^t>>>1:t>>>1;e[r]=t}return e}();e.exports=function(t,e,r,i){var n=o,s=i+r;t^=-1;for(var a=i;a<s;a++)t=t>>>8^n[255&(t^e[a])];return-1^t}},{}],46:[function(t,e,r){"use strict";var h,d=t("../utils/common"),u=t("./trees"),c=t("./adler32"),p=t("./crc32"),i=t("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,n=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(t,e){return t.msg=i[e],e}function T(t){return(t<<1)-(4<t?9:0)}function D(t){for(var e=t.length;0<=--e;)t[e]=0}function F(t){var e=t.state,r=e.pending;r>t.avail_out&&(r=t.avail_out),0!==r&&(d.arraySet(t.output,e.pending_buf,e.pending_out,r,t.next_out),t.next_out+=r,e.pending_out+=r,t.total_out+=r,t.avail_out-=r,e.pending-=r,0===e.pending&&(e.pending_out=0))}function N(t,e){u._tr_flush_block(t,0<=t.block_start?t.block_start:-1,t.strstart-t.block_start,e),t.block_start=t.strstart,F(t.strm)}function U(t,e){t.pending_buf[t.pending++]=e}function P(t,e){t.pending_buf[t.pending++]=e>>>8&255,t.pending_buf[t.pending++]=255&e}function L(t,e){var r,i,n=t.max_chain_length,s=t.strstart,a=t.prev_length,o=t.nice_match,h=t.strstart>t.w_size-z?t.strstart-(t.w_size-z):0,u=t.window,l=t.w_mask,f=t.prev,d=t.strstart+S,c=u[s+a-1],p=u[s+a];t.prev_length>=t.good_match&&(n>>=2),o>t.lookahead&&(o=t.lookahead);do{if(u[(r=e)+a]===p&&u[r+a-1]===c&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&s<d);if(i=S-(d-s),s=d-S,a<i){if(t.match_start=e,o<=(a=i))break;c=u[s+a-1],p=u[s+a]}}}while((e=f[e&l])>h&&0!=--n);return a<=t.lookahead?a:t.lookahead}function j(t){var e,r,i,n,s,a,o,h,u,l,f=t.w_size;do{if(n=t.window_size-t.lookahead-t.strstart,t.strstart>=f+(f-z)){for(d.arraySet(t.window,t.window,f,f,0),t.match_start-=f,t.strstart-=f,t.block_start-=f,e=r=t.hash_size;i=t.head[--e],t.head[e]=f<=i?i-f:0,--r;);for(e=r=f;i=t.prev[--e],t.prev[e]=f<=i?i-f:0,--r;);n+=f}if(0===t.strm.avail_in)break;if(a=t.strm,o=t.window,h=t.strstart+t.lookahead,u=n,l=void 0,l=a.avail_in,u<l&&(l=u),r=0===l?0:(a.avail_in-=l,d.arraySet(o,a.input,a.next_in,l,h),1===a.state.wrap?a.adler=c(a.adler,o,l,h):2===a.state.wrap&&(a.adler=p(a.adler,o,l,h)),a.next_in+=l,a.total_in+=l,l),t.lookahead+=r,t.lookahead+t.insert>=x)for(s=t.strstart-t.insert,t.ins_h=t.window[s],t.ins_h=(t.ins_h<<t.hash_shift^t.window[s+1])&t.hash_mask;t.insert&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[s+x-1])&t.hash_mask,t.prev[s&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=s,s++,t.insert--,!(t.lookahead+t.insert<x)););}while(t.lookahead<z&&0!==t.strm.avail_in)}function Z(t,e){for(var r,i;;){if(t.lookahead<z){if(j(t),t.lookahead<z&&e===l)return A;if(0===t.lookahead)break}if(r=0,t.lookahead>=x&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart),0!==r&&t.strstart-r<=t.w_size-z&&(t.match_length=L(t,r)),t.match_length>=x)if(i=u._tr_tally(t,t.strstart-t.match_start,t.match_length-x),t.lookahead-=t.match_length,t.match_length<=t.max_lazy_match&&t.lookahead>=x){for(t.match_length--;t.strstart++,t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart,0!=--t.match_length;);t.strstart++}else t.strstart+=t.match_length,t.match_length=0,t.ins_h=t.window[t.strstart],t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+1])&t.hash_mask;else i=u._tr_tally(t,0,t.window[t.strstart]),t.lookahead--,t.strstart++;if(i&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=t.strstart<x-1?t.strstart:x-1,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}function W(t,e){for(var r,i,n;;){if(t.lookahead<z){if(j(t),t.lookahead<z&&e===l)return A;if(0===t.lookahead)break}if(r=0,t.lookahead>=x&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart),t.prev_length=t.match_length,t.prev_match=t.match_start,t.match_length=x-1,0!==r&&t.prev_length<t.max_lazy_match&&t.strstart-r<=t.w_size-z&&(t.match_length=L(t,r),t.match_length<=5&&(1===t.strategy||t.match_length===x&&4096<t.strstart-t.match_start)&&(t.match_length=x-1)),t.prev_length>=x&&t.match_length<=t.prev_length){for(n=t.strstart+t.lookahead-x,i=u._tr_tally(t,t.strstart-1-t.prev_match,t.prev_length-x),t.lookahead-=t.prev_length-1,t.prev_length-=2;++t.strstart<=n&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart),0!=--t.prev_length;);if(t.match_available=0,t.match_length=x-1,t.strstart++,i&&(N(t,!1),0===t.strm.avail_out))return A}else if(t.match_available){if((i=u._tr_tally(t,0,t.window[t.strstart-1]))&&N(t,!1),t.strstart++,t.lookahead--,0===t.strm.avail_out)return A}else t.match_available=1,t.strstart++,t.lookahead--}return t.match_available&&(i=u._tr_tally(t,0,t.window[t.strstart-1]),t.match_available=0),t.insert=t.strstart<x-1?t.strstart:x-1,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}function M(t,e,r,i,n){this.good_length=t,this.max_lazy=e,this.nice_length=r,this.max_chain=i,this.func=n}function H(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=v,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new d.Buf16(2*w),this.dyn_dtree=new d.Buf16(2*(2*a+1)),this.bl_tree=new d.Buf16(2*(2*o+1)),D(this.dyn_ltree),D(this.dyn_dtree),D(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new d.Buf16(k+1),this.heap=new d.Buf16(2*s+1),D(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new d.Buf16(2*s+1),D(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function G(t){var e;return t&&t.state?(t.total_in=t.total_out=0,t.data_type=n,(e=t.state).pending=0,e.pending_out=0,e.wrap<0&&(e.wrap=-e.wrap),e.status=e.wrap?C:E,t.adler=2===e.wrap?0:1,e.last_flush=l,u._tr_init(e),m):R(t,_)}function K(t){var e=G(t);return e===m&&function(t){t.window_size=2*t.w_size,D(t.head),t.max_lazy_match=h[t.level].max_lazy,t.good_match=h[t.level].good_length,t.nice_match=h[t.level].nice_length,t.max_chain_length=h[t.level].max_chain,t.strstart=0,t.block_start=0,t.lookahead=0,t.insert=0,t.match_length=t.prev_length=x-1,t.match_available=0,t.ins_h=0}(t.state),e}function Y(t,e,r,i,n,s){if(!t)return _;var a=1;if(e===g&&(e=6),i<0?(a=0,i=-i):15<i&&(a=2,i-=16),n<1||y<n||r!==v||i<8||15<i||e<0||9<e||s<0||b<s)return R(t,_);8===i&&(i=9);var o=new H;return(t.state=o).strm=t,o.wrap=a,o.gzhead=null,o.w_bits=i,o.w_size=1<<o.w_bits,o.w_mask=o.w_size-1,o.hash_bits=n+7,o.hash_size=1<<o.hash_bits,o.hash_mask=o.hash_size-1,o.hash_shift=~~((o.hash_bits+x-1)/x),o.window=new d.Buf8(2*o.w_size),o.head=new d.Buf16(o.hash_size),o.prev=new d.Buf16(o.w_size),o.lit_bufsize=1<<n+6,o.pending_buf_size=4*o.lit_bufsize,o.pending_buf=new d.Buf8(o.pending_buf_size),o.d_buf=1*o.lit_bufsize,o.l_buf=3*o.lit_bufsize,o.level=e,o.strategy=s,o.method=r,K(t)}h=[new M(0,0,0,0,function(t,e){var r=65535;for(r>t.pending_buf_size-5&&(r=t.pending_buf_size-5);;){if(t.lookahead<=1){if(j(t),0===t.lookahead&&e===l)return A;if(0===t.lookahead)break}t.strstart+=t.lookahead,t.lookahead=0;var i=t.block_start+r;if((0===t.strstart||t.strstart>=i)&&(t.lookahead=t.strstart-i,t.strstart=i,N(t,!1),0===t.strm.avail_out))return A;if(t.strstart-t.block_start>=t.w_size-z&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=0,e===f?(N(t,!0),0===t.strm.avail_out?O:B):(t.strstart>t.block_start&&(N(t,!1),t.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(t,e){return Y(t,e,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(t,e){return t&&t.state?2!==t.state.wrap?_:(t.state.gzhead=e,m):_},r.deflate=function(t,e){var r,i,n,s;if(!t||!t.state||5<e||e<0)return t?R(t,_):_;if(i=t.state,!t.output||!t.input&&0!==t.avail_in||666===i.status&&e!==f)return R(t,0===t.avail_out?-5:_);if(i.strm=t,r=i.last_flush,i.last_flush=e,i.status===C)if(2===i.wrap)t.adler=0,U(i,31),U(i,139),U(i,8),i.gzhead?(U(i,(i.gzhead.text?1:0)+(i.gzhead.hcrc?2:0)+(i.gzhead.extra?4:0)+(i.gzhead.name?8:0)+(i.gzhead.comment?16:0)),U(i,255&i.gzhead.time),U(i,i.gzhead.time>>8&255),U(i,i.gzhead.time>>16&255),U(i,i.gzhead.time>>24&255),U(i,9===i.level?2:2<=i.strategy||i.level<2?4:0),U(i,255&i.gzhead.os),i.gzhead.extra&&i.gzhead.extra.length&&(U(i,255&i.gzhead.extra.length),U(i,i.gzhead.extra.length>>8&255)),i.gzhead.hcrc&&(t.adler=p(t.adler,i.pending_buf,i.pending,0)),i.gzindex=0,i.status=69):(U(i,0),U(i,0),U(i,0),U(i,0),U(i,0),U(i,9===i.level?2:2<=i.strategy||i.level<2?4:0),U(i,3),i.status=E);else{var a=v+(i.w_bits-8<<4)<<8;a|=(2<=i.strategy||i.level<2?0:i.level<6?1:6===i.level?2:3)<<6,0!==i.strstart&&(a|=32),a+=31-a%31,i.status=E,P(i,a),0!==i.strstart&&(P(i,t.adler>>>16),P(i,65535&t.adler)),t.adler=1}if(69===i.status)if(i.gzhead.extra){for(n=i.pending;i.gzindex<(65535&i.gzhead.extra.length)&&(i.pending!==i.pending_buf_size||(i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),F(t),n=i.pending,i.pending!==i.pending_buf_size));)U(i,255&i.gzhead.extra[i.gzindex]),i.gzindex++;i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),i.gzindex===i.gzhead.extra.length&&(i.gzindex=0,i.status=73)}else i.status=73;if(73===i.status)if(i.gzhead.name){n=i.pending;do{if(i.pending===i.pending_buf_size&&(i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),F(t),n=i.pending,i.pending===i.pending_buf_size)){s=1;break}s=i.gzindex<i.gzhead.name.length?255&i.gzhead.name.charCodeAt(i.gzindex++):0,U(i,s)}while(0!==s);i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),0===s&&(i.gzindex=0,i.status=91)}else i.status=91;if(91===i.status)if(i.gzhead.comment){n=i.pending;do{if(i.pending===i.pending_buf_size&&(i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),F(t),n=i.pending,i.pending===i.pending_buf_size)){s=1;break}s=i.gzindex<i.gzhead.comment.length?255&i.gzhead.comment.charCodeAt(i.gzindex++):0,U(i,s)}while(0!==s);i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),0===s&&(i.status=103)}else i.status=103;if(103===i.status&&(i.gzhead.hcrc?(i.pending+2>i.pending_buf_size&&F(t),i.pending+2<=i.pending_buf_size&&(U(i,255&t.adler),U(i,t.adler>>8&255),t.adler=0,i.status=E)):i.status=E),0!==i.pending){if(F(t),0===t.avail_out)return i.last_flush=-1,m}else if(0===t.avail_in&&T(e)<=T(r)&&e!==f)return R(t,-5);if(666===i.status&&0!==t.avail_in)return R(t,-5);if(0!==t.avail_in||0!==i.lookahead||e!==l&&666!==i.status){var o=2===i.strategy?function(t,e){for(var r;;){if(0===t.lookahead&&(j(t),0===t.lookahead)){if(e===l)return A;break}if(t.match_length=0,r=u._tr_tally(t,0,t.window[t.strstart]),t.lookahead--,t.strstart++,r&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=0,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}(i,e):3===i.strategy?function(t,e){for(var r,i,n,s,a=t.window;;){if(t.lookahead<=S){if(j(t),t.lookahead<=S&&e===l)return A;if(0===t.lookahead)break}if(t.match_length=0,t.lookahead>=x&&0<t.strstart&&(i=a[n=t.strstart-1])===a[++n]&&i===a[++n]&&i===a[++n]){s=t.strstart+S;do{}while(i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&n<s);t.match_length=S-(s-n),t.match_length>t.lookahead&&(t.match_length=t.lookahead)}if(t.match_length>=x?(r=u._tr_tally(t,1,t.match_length-x),t.lookahead-=t.match_length,t.strstart+=t.match_length,t.match_length=0):(r=u._tr_tally(t,0,t.window[t.strstart]),t.lookahead--,t.strstart++),r&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=0,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}(i,e):h[i.level].func(i,e);if(o!==O&&o!==B||(i.status=666),o===A||o===O)return 0===t.avail_out&&(i.last_flush=-1),m;if(o===I&&(1===e?u._tr_align(i):5!==e&&(u._tr_stored_block(i,0,0,!1),3===e&&(D(i.head),0===i.lookahead&&(i.strstart=0,i.block_start=0,i.insert=0))),F(t),0===t.avail_out))return i.last_flush=-1,m}return e!==f?m:i.wrap<=0?1:(2===i.wrap?(U(i,255&t.adler),U(i,t.adler>>8&255),U(i,t.adler>>16&255),U(i,t.adler>>24&255),U(i,255&t.total_in),U(i,t.total_in>>8&255),U(i,t.total_in>>16&255),U(i,t.total_in>>24&255)):(P(i,t.adler>>>16),P(i,65535&t.adler)),F(t),0<i.wrap&&(i.wrap=-i.wrap),0!==i.pending?m:1)},r.deflateEnd=function(t){var e;return t&&t.state?(e=t.state.status)!==C&&69!==e&&73!==e&&91!==e&&103!==e&&e!==E&&666!==e?R(t,_):(t.state=null,e===E?R(t,-3):m):_},r.deflateSetDictionary=function(t,e){var r,i,n,s,a,o,h,u,l=e.length;if(!t||!t.state)return _;if(2===(s=(r=t.state).wrap)||1===s&&r.status!==C||r.lookahead)return _;for(1===s&&(t.adler=c(t.adler,e,l,0)),r.wrap=0,l>=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new d.Buf8(r.w_size),d.arraySet(u,e,l-r.w_size,r.w_size,0),e=u,l=r.w_size),a=t.avail_in,o=t.next_in,h=t.input,t.avail_in=l,t.next_in=0,t.input=e,j(r);r.lookahead>=x;){for(i=r.strstart,n=r.lookahead-(x-1);r.ins_h=(r.ins_h<<r.hash_shift^r.window[i+x-1])&r.hash_mask,r.prev[i&r.w_mask]=r.head[r.ins_h],r.head[r.ins_h]=i,i++,--n;);r.strstart=i,r.lookahead=x-1,j(r)}return r.strstart+=r.lookahead,r.block_start=r.strstart,r.insert=r.lookahead,r.lookahead=0,r.match_length=r.prev_length=x-1,r.match_available=0,t.next_in=o,t.input=h,t.avail_in=a,r.wrap=s,m},r.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":41,"./adler32":43,"./crc32":45,"./messages":51,"./trees":52}],47:[function(t,e,r){"use strict";e.exports=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}},{}],48:[function(t,e,r){"use strict";e.exports=function(t,e){var r,i,n,s,a,o,h,u,l,f,d,c,p,m,_,g,b,v,y,w,k,x,S,z,C;r=t.state,i=t.next_in,z=t.input,n=i+(t.avail_in-5),s=t.next_out,C=t.output,a=s-(e-t.avail_out),o=s+(t.avail_out-257),h=r.dmax,u=r.wsize,l=r.whave,f=r.wnext,d=r.window,c=r.hold,p=r.bits,m=r.lencode,_=r.distcode,g=(1<<r.lenbits)-1,b=(1<<r.distbits)-1;t:do{p<15&&(c+=z[i++]<<p,p+=8,c+=z[i++]<<p,p+=8),v=m[c&g];e:for(;;){if(c>>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(c&(1<<y)-1)];continue e}if(32&y){r.mode=12;break t}t.msg="invalid literal/length code",r.mode=30;break t}w=65535&v,(y&=15)&&(p<y&&(c+=z[i++]<<p,p+=8),w+=c&(1<<y)-1,c>>>=y,p-=y),p<15&&(c+=z[i++]<<p,p+=8,c+=z[i++]<<p,p+=8),v=_[c&b];r:for(;;){if(c>>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(c&(1<<y)-1)];continue r}t.msg="invalid distance code",r.mode=30;break t}if(k=65535&v,p<(y&=15)&&(c+=z[i++]<<p,(p+=8)<y&&(c+=z[i++]<<p,p+=8)),h<(k+=c&(1<<y)-1)){t.msg="invalid distance too far back",r.mode=30;break t}if(c>>>=y,p-=y,(y=s-a)<k){if(l<(y=k-y)&&r.sane){t.msg="invalid distance too far back",r.mode=30;break t}if(S=d,(x=0)===f){if(x+=u-y,y<w){for(w-=y;C[s++]=d[x++],--y;);x=s-k,S=C}}else if(f<y){if(x+=u+f-y,(y-=f)<w){for(w-=y;C[s++]=d[x++],--y;);if(x=0,f<w){for(w-=y=f;C[s++]=d[x++],--y;);x=s-k,S=C}}}else if(x+=f-y,y<w){for(w-=y;C[s++]=d[x++],--y;);x=s-k,S=C}for(;2<w;)C[s++]=S[x++],C[s++]=S[x++],C[s++]=S[x++],w-=3;w&&(C[s++]=S[x++],1<w&&(C[s++]=S[x++]))}else{for(x=s-k;C[s++]=C[x++],C[s++]=C[x++],C[s++]=C[x++],2<(w-=3););w&&(C[s++]=C[x++],1<w&&(C[s++]=C[x++]))}break}}break}}while(i<n&&s<o);i-=w=p>>3,c&=(1<<(p-=w<<3))-1,t.next_in=i,t.next_out=s,t.avail_in=i<n?n-i+5:5-(i-n),t.avail_out=s<o?o-s+257:257-(s-o),r.hold=c,r.bits=p}},{}],49:[function(t,e,r){"use strict";var I=t("../utils/common"),O=t("./adler32"),B=t("./crc32"),R=t("./inffast"),T=t("./inftrees"),D=1,F=2,N=0,U=-2,P=1,i=852,n=592;function L(t){return(t>>>24&255)+(t>>>8&65280)+((65280&t)<<8)+((255&t)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(t){var e;return t&&t.state?(e=t.state,t.total_in=t.total_out=e.total=0,t.msg="",e.wrap&&(t.adler=1&e.wrap),e.mode=P,e.last=0,e.havedict=0,e.dmax=32768,e.head=null,e.hold=0,e.bits=0,e.lencode=e.lendyn=new I.Buf32(i),e.distcode=e.distdyn=new I.Buf32(n),e.sane=1,e.back=-1,N):U}function o(t){var e;return t&&t.state?((e=t.state).wsize=0,e.whave=0,e.wnext=0,a(t)):U}function h(t,e){var r,i;return t&&t.state?(i=t.state,e<0?(r=0,e=-e):(r=1+(e>>4),e<48&&(e&=15)),e&&(e<8||15<e)?U:(null!==i.window&&i.wbits!==e&&(i.window=null),i.wrap=r,i.wbits=e,o(t))):U}function u(t,e){var r,i;return t?(i=new s,(t.state=i).window=null,(r=h(t,e))!==N&&(t.state=null),r):U}var l,f,d=!0;function j(t){if(d){var e;for(l=new I.Buf32(512),f=new I.Buf32(32),e=0;e<144;)t.lens[e++]=8;for(;e<256;)t.lens[e++]=9;for(;e<280;)t.lens[e++]=7;for(;e<288;)t.lens[e++]=8;for(T(D,t.lens,0,288,l,0,t.work,{bits:9}),e=0;e<32;)t.lens[e++]=5;T(F,t.lens,0,32,f,0,t.work,{bits:5}),d=!1}t.lencode=l,t.lenbits=9,t.distcode=f,t.distbits=5}function Z(t,e,r,i){var n,s=t.state;return null===s.window&&(s.wsize=1<<s.wbits,s.wnext=0,s.whave=0,s.window=new I.Buf8(s.wsize)),i>=s.wsize?(I.arraySet(s.window,e,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(i<(n=s.wsize-s.wnext)&&(n=i),I.arraySet(s.window,e,r-i,n,s.wnext),(i-=n)?(I.arraySet(s.window,e,r-i,i,0),s.wnext=i,s.whave=s.wsize):(s.wnext+=n,s.wnext===s.wsize&&(s.wnext=0),s.whave<s.wsize&&(s.whave+=n))),0}r.inflateReset=o,r.inflateReset2=h,r.inflateResetKeep=a,r.inflateInit=function(t){return u(t,15)},r.inflateInit2=u,r.inflate=function(t,e){var r,i,n,s,a,o,h,u,l,f,d,c,p,m,_,g,b,v,y,w,k,x,S,z,C=0,E=new I.Buf8(4),A=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!t||!t.state||!t.output||!t.input&&0!==t.avail_in)return U;12===(r=t.state).mode&&(r.mode=13),a=t.next_out,n=t.output,h=t.avail_out,s=t.next_in,i=t.input,o=t.avail_in,u=r.hold,l=r.bits,f=o,d=h,x=N;t:for(;;)switch(r.mode){case P:if(0===r.wrap){r.mode=13;break}for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(2&r.wrap&&35615===u){E[r.check=0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){t.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){t.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){t.msg="invalid window size",r.mode=30;break}r.dmax=1<<k,t.adler=r.check=1,r.mode=512&u?10:12,l=u=0;break;case 2:for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(r.flags=u,8!=(255&r.flags)){t.msg="unknown compression method",r.mode=30;break}if(57344&r.flags){t.msg="unknown header flags set",r.mode=30;break}r.head&&(r.head.text=u>>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.head&&(r.head.time=u),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.head&&(r.head.xflags=255&u,r.head.os=u>>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.length=u,r.head&&(r.head.extra_len=u),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(c=r.length)&&(c=o),c&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,i,s,c,k)),512&r.flags&&(r.check=B(r.check,i,c,s)),o-=c,s+=c,r.length-=c),r.length))break t;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break t;for(c=0;k=i[s+c++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&c<o;);if(512&r.flags&&(r.check=B(r.check,i,c,s)),o-=c,s+=c,k)break t}else r.head&&(r.head.name=null);r.length=0,r.mode=8;case 8:if(4096&r.flags){if(0===o)break t;for(c=0;k=i[s+c++],r.head&&k&&r.length<65536&&(r.head.comment+=String.fromCharCode(k)),k&&c<o;);if(512&r.flags&&(r.check=B(r.check,i,c,s)),o-=c,s+=c,k)break t}else r.head&&(r.head.comment=null);r.mode=9;case 9:if(512&r.flags){for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(u!==(65535&r.check)){t.msg="header crc mismatch",r.mode=30;break}l=u=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),t.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}t.adler=r.check=L(u),l=u=0,r.mode=11;case 11:if(0===r.havedict)return t.next_out=a,t.avail_out=h,t.next_in=s,t.avail_in=o,r.hold=u,r.bits=l,2;t.adler=r.check=1,r.mode=12;case 12:if(5===e||6===e)break t;case 13:if(r.last){u>>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}switch(r.last=1&u,l-=1,3&(u>>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==e)break;u>>>=2,l-=2;break t;case 2:r.mode=17;break;case 3:t.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if((65535&u)!=(u>>>16^65535)){t.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===e)break t;case 15:r.mode=16;case 16:if(c=r.length){if(o<c&&(c=o),h<c&&(c=h),0===c)break t;I.arraySet(n,i,s,c,a),o-=c,s+=c,h-=c,a+=c,r.length-=c;break}r.mode=12;break;case 17:for(;l<14;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(r.nlen=257+(31&u),u>>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286<r.nlen||30<r.ndist){t.msg="too many length or distance symbols",r.mode=30;break}r.have=0,r.mode=18;case 18:for(;r.have<r.ncode;){for(;l<3;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.lens[A[r.have++]]=7&u,u>>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){t.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have<r.nlen+r.ndist;){for(;g=(C=r.lencode[u&(1<<r.lenbits)-1])>>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(b<16)u>>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(u>>>=_,l-=_,0===r.have){t.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],c=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}l-=_,k=0,c=3+(7&(u>>>=_)),u>>>=3,l-=3}else{for(z=_+7;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}l-=_,k=0,c=11+(127&(u>>>=_)),u>>>=7,l-=7}if(r.have+c>r.nlen+r.ndist){t.msg="invalid bit length repeat",r.mode=30;break}for(;c--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){t.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){t.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){t.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===e)break t;case 20:r.mode=21;case 21:if(6<=o&&258<=h){t.next_out=a,t.avail_out=h,t.next_in=s,t.avail_in=o,r.hold=u,r.bits=l,R(t,d),a=t.next_out,n=t.output,h=t.avail_out,s=t.next_in,i=t.input,o=t.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<<r.lenbits)-1])>>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(g&&0==(240&g)){for(v=_,y=g,w=b;g=(C=r.lencode[w+((u&(1<<v+y)-1)>>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}u>>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){t.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.length+=u&(1<<r.extra)-1,u>>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<<r.distbits)-1])>>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(0==(240&g)){for(v=_,y=g,w=b;g=(C=r.distcode[w+((u&(1<<v+y)-1)>>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}u>>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){t.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.offset+=u&(1<<r.extra)-1,u>>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){t.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break t;if(c=d-h,r.offset>c){if((c=r.offset-c)>r.whave&&r.sane){t.msg="invalid distance too far back",r.mode=30;break}p=c>r.wnext?(c-=r.wnext,r.wsize-c):r.wnext-c,c>r.length&&(c=r.length),m=r.window}else m=n,p=a-r.offset,c=r.length;for(h<c&&(c=h),h-=c,r.length-=c;n[a++]=m[p++],--c;);0===r.length&&(r.mode=21);break;case 26:if(0===h)break t;n[a++]=r.length,h--,r.mode=21;break;case 27:if(r.wrap){for(;l<32;){if(0===o)break t;o--,u|=i[s++]<<l,l+=8}if(d-=h,t.total_out+=d,r.total+=d,d&&(t.adler=r.check=r.flags?B(r.check,n,d,a-d):O(r.check,n,d,a-d)),d=h,(r.flags?u:L(u))!==r.check){t.msg="incorrect data check",r.mode=30;break}l=u=0}r.mode=28;case 28:if(r.wrap&&r.flags){for(;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(u!==(4294967295&r.total)){t.msg="incorrect length check",r.mode=30;break}l=u=0}r.mode=29;case 29:x=1;break t;case 30:x=-3;break t;case 31:return-4;case 32:default:return U}return t.next_out=a,t.avail_out=h,t.next_in=s,t.avail_in=o,r.hold=u,r.bits=l,(r.wsize||d!==t.avail_out&&r.mode<30&&(r.mode<27||4!==e))&&Z(t,t.output,t.next_out,d-t.avail_out)?(r.mode=31,-4):(f-=t.avail_in,d-=t.avail_out,t.total_in+=f,t.total_out+=d,r.total+=d,r.wrap&&d&&(t.adler=r.check=r.flags?B(r.check,n,d,t.next_out-d):O(r.check,n,d,t.next_out-d)),t.data_type=r.bits+(r.last?64:0)+(12===r.mode?128:0)+(20===r.mode||15===r.mode?256:0),(0==f&&0===d||4===e)&&x===N&&(x=-5),x)},r.inflateEnd=function(t){if(!t||!t.state)return U;var e=t.state;return e.window&&(e.window=null),t.state=null,N},r.inflateGetHeader=function(t,e){var r;return t&&t.state?0==(2&(r=t.state).wrap)?U:((r.head=e).done=!1,N):U},r.inflateSetDictionary=function(t,e){var r,i=e.length;return t&&t.state?0!==(r=t.state).wrap&&11!==r.mode?U:11===r.mode&&O(1,e,i,0)!==r.check?-3:Z(t,e,i,i)?(r.mode=31,-4):(r.havedict=1,N):U},r.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":41,"./adler32":43,"./crc32":45,"./inffast":48,"./inftrees":50}],50:[function(t,e,r){"use strict";var D=t("../utils/common"),F=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],N=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],U=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],P=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];e.exports=function(t,e,r,i,n,s,a,o){var h,u,l,f,d,c,p,m,_,g=o.bits,b=0,v=0,y=0,w=0,k=0,x=0,S=0,z=0,C=0,E=0,A=null,I=0,O=new D.Buf16(16),B=new D.Buf16(16),R=null,T=0;for(b=0;b<=15;b++)O[b]=0;for(v=0;v<i;v++)O[e[r+v]]++;for(k=g,w=15;1<=w&&0===O[w];w--);if(w<k&&(k=w),0===w)return n[s++]=20971520,n[s++]=20971520,o.bits=1,0;for(y=1;y<w&&0===O[y];y++);for(k<y&&(k=y),b=z=1;b<=15;b++)if(z<<=1,(z-=O[b])<0)return-1;if(0<z&&(0===t||1!==w))return-1;for(B[1]=0,b=1;b<15;b++)B[b+1]=B[b]+O[b];for(v=0;v<i;v++)0!==e[r+v]&&(a[B[e[r+v]]++]=v);if(c=0===t?(A=R=a,19):1===t?(A=F,I-=257,R=N,T-=257,256):(A=U,R=P,-1),b=y,d=s,S=v=E=0,l=-1,f=(C=1<<(x=k))-1,1===t&&852<C||2===t&&592<C)return 1;for(;;){for(p=b-S,_=a[v]<c?(m=0,a[v]):a[v]>c?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<<b-S,y=u=1<<x;n[d+(E>>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<<b-1;E&h;)h>>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=e[r+a[v]]}if(k<b&&(E&f)!==l){for(0===S&&(S=k),d+=y,z=1<<(x=b-S);x+S<w&&!((z-=O[x+S])<=0);)x++,z<<=1;if(C+=1<<x,1===t&&852<C||2===t&&592<C)return 1;n[l=E&f]=k<<24|x<<16|d-s|0}}return 0!==E&&(n[d+E]=b-S<<24|64<<16|0),o.bits=k,0}},{"../utils/common":41}],51:[function(t,e,r){"use strict";e.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],52:[function(t,e,r){"use strict";var n=t("../utils/common"),o=0,h=1;function i(t){for(var e=t.length;0<=--e;)t[e]=0}var s=0,a=29,u=256,l=u+1+a,f=30,d=19,_=2*l+1,g=15,c=16,p=7,m=256,b=16,v=17,y=18,w=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],k=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],x=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],S=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],z=new Array(2*(l+2));i(z);var C=new Array(2*f);i(C);var E=new Array(512);i(E);var A=new Array(256);i(A);var I=new Array(a);i(I);var O,B,R,T=new Array(f);function D(t,e,r,i,n){this.static_tree=t,this.extra_bits=e,this.extra_base=r,this.elems=i,this.max_length=n,this.has_stree=t&&t.length}function F(t,e){this.dyn_tree=t,this.max_code=0,this.stat_desc=e}function N(t){return t<256?E[t]:E[256+(t>>>7)]}function U(t,e){t.pending_buf[t.pending++]=255&e,t.pending_buf[t.pending++]=e>>>8&255}function P(t,e,r){t.bi_valid>c-r?(t.bi_buf|=e<<t.bi_valid&65535,U(t,t.bi_buf),t.bi_buf=e>>c-t.bi_valid,t.bi_valid+=r-c):(t.bi_buf|=e<<t.bi_valid&65535,t.bi_valid+=r)}function L(t,e,r){P(t,r[2*e],r[2*e+1])}function j(t,e){for(var r=0;r|=1&t,t>>>=1,r<<=1,0<--e;);return r>>>1}function Z(t,e,r){var i,n,s=new Array(g+1),a=0;for(i=1;i<=g;i++)s[i]=a=a+r[i-1]<<1;for(n=0;n<=e;n++){var o=t[2*n+1];0!==o&&(t[2*n]=j(s[o]++,o))}}function W(t){var e;for(e=0;e<l;e++)t.dyn_ltree[2*e]=0;for(e=0;e<f;e++)t.dyn_dtree[2*e]=0;for(e=0;e<d;e++)t.bl_tree[2*e]=0;t.dyn_ltree[2*m]=1,t.opt_len=t.static_len=0,t.last_lit=t.matches=0}function M(t){8<t.bi_valid?U(t,t.bi_buf):0<t.bi_valid&&(t.pending_buf[t.pending++]=t.bi_buf),t.bi_buf=0,t.bi_valid=0}function H(t,e,r,i){var n=2*e,s=2*r;return t[n]<t[s]||t[n]===t[s]&&i[e]<=i[r]}function G(t,e,r){for(var i=t.heap[r],n=r<<1;n<=t.heap_len&&(n<t.heap_len&&H(e,t.heap[n+1],t.heap[n],t.depth)&&n++,!H(e,i,t.heap[n],t.depth));)t.heap[r]=t.heap[n],r=n,n<<=1;t.heap[r]=i}function K(t,e,r){var i,n,s,a,o=0;if(0!==t.last_lit)for(;i=t.pending_buf[t.d_buf+2*o]<<8|t.pending_buf[t.d_buf+2*o+1],n=t.pending_buf[t.l_buf+o],o++,0===i?L(t,n,e):(L(t,(s=A[n])+u+1,e),0!==(a=w[s])&&P(t,n-=I[s],a),L(t,s=N(--i),r),0!==(a=k[s])&&P(t,i-=T[s],a)),o<t.last_lit;);L(t,m,e)}function Y(t,e){var r,i,n,s=e.dyn_tree,a=e.stat_desc.static_tree,o=e.stat_desc.has_stree,h=e.stat_desc.elems,u=-1;for(t.heap_len=0,t.heap_max=_,r=0;r<h;r++)0!==s[2*r]?(t.heap[++t.heap_len]=u=r,t.depth[r]=0):s[2*r+1]=0;for(;t.heap_len<2;)s[2*(n=t.heap[++t.heap_len]=u<2?++u:0)]=1,t.depth[n]=0,t.opt_len--,o&&(t.static_len-=a[2*n+1]);for(e.max_code=u,r=t.heap_len>>1;1<=r;r--)G(t,s,r);for(n=h;r=t.heap[1],t.heap[1]=t.heap[t.heap_len--],G(t,s,1),i=t.heap[1],t.heap[--t.heap_max]=r,t.heap[--t.heap_max]=i,s[2*n]=s[2*r]+s[2*i],t.depth[n]=(t.depth[r]>=t.depth[i]?t.depth[r]:t.depth[i])+1,s[2*r+1]=s[2*i+1]=n,t.heap[1]=n++,G(t,s,1),2<=t.heap_len;);t.heap[--t.heap_max]=t.heap[1],function(t,e){var r,i,n,s,a,o,h=e.dyn_tree,u=e.max_code,l=e.stat_desc.static_tree,f=e.stat_desc.has_stree,d=e.stat_desc.extra_bits,c=e.stat_desc.extra_base,p=e.stat_desc.max_length,m=0;for(s=0;s<=g;s++)t.bl_count[s]=0;for(h[2*t.heap[t.heap_max]+1]=0,r=t.heap_max+1;r<_;r++)p<(s=h[2*h[2*(i=t.heap[r])+1]+1]+1)&&(s=p,m++),h[2*i+1]=s,u<i||(t.bl_count[s]++,a=0,c<=i&&(a=d[i-c]),o=h[2*i],t.opt_len+=o*(s+a),f&&(t.static_len+=o*(l[2*i+1]+a)));if(0!==m){do{for(s=p-1;0===t.bl_count[s];)s--;t.bl_count[s]--,t.bl_count[s+1]+=2,t.bl_count[p]--,m-=2}while(0<m);for(s=p;0!==s;s--)for(i=t.bl_count[s];0!==i;)u<(n=t.heap[--r])||(h[2*n+1]!==s&&(t.opt_len+=(s-h[2*n+1])*h[2*n],h[2*n+1]=s),i--)}}(t,e),Z(s,u,t.bl_count)}function X(t,e,r){var i,n,s=-1,a=e[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),e[2*(r+1)+1]=65535,i=0;i<=r;i++)n=a,a=e[2*(i+1)+1],++o<h&&n===a||(o<u?t.bl_tree[2*n]+=o:0!==n?(n!==s&&t.bl_tree[2*n]++,t.bl_tree[2*b]++):o<=10?t.bl_tree[2*v]++:t.bl_tree[2*y]++,s=n,u=(o=0)===a?(h=138,3):n===a?(h=6,3):(h=7,4))}function V(t,e,r){var i,n,s=-1,a=e[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),i=0;i<=r;i++)if(n=a,a=e[2*(i+1)+1],!(++o<h&&n===a)){if(o<u)for(;L(t,n,t.bl_tree),0!=--o;);else 0!==n?(n!==s&&(L(t,n,t.bl_tree),o--),L(t,b,t.bl_tree),P(t,o-3,2)):o<=10?(L(t,v,t.bl_tree),P(t,o-3,3)):(L(t,y,t.bl_tree),P(t,o-11,7));s=n,u=(o=0)===a?(h=138,3):n===a?(h=6,3):(h=7,4)}}i(T);var q=!1;function J(t,e,r,i){P(t,(s<<1)+(i?1:0),3),function(t,e,r,i){M(t),i&&(U(t,r),U(t,~r)),n.arraySet(t.pending_buf,t.window,e,r,t.pending),t.pending+=r}(t,e,r,!0)}r._tr_init=function(t){q||(function(){var t,e,r,i,n,s=new Array(g+1);for(i=r=0;i<a-1;i++)for(I[i]=r,t=0;t<1<<w[i];t++)A[r++]=i;for(A[r-1]=i,i=n=0;i<16;i++)for(T[i]=n,t=0;t<1<<k[i];t++)E[n++]=i;for(n>>=7;i<f;i++)for(T[i]=n<<7,t=0;t<1<<k[i]-7;t++)E[256+n++]=i;for(e=0;e<=g;e++)s[e]=0;for(t=0;t<=143;)z[2*t+1]=8,t++,s[8]++;for(;t<=255;)z[2*t+1]=9,t++,s[9]++;for(;t<=279;)z[2*t+1]=7,t++,s[7]++;for(;t<=287;)z[2*t+1]=8,t++,s[8]++;for(Z(z,l+1,s),t=0;t<f;t++)C[2*t+1]=5,C[2*t]=j(t,5);O=new D(z,w,u+1,l,g),B=new D(C,k,0,f,g),R=new D(new Array(0),x,0,d,p)}(),q=!0),t.l_desc=new F(t.dyn_ltree,O),t.d_desc=new F(t.dyn_dtree,B),t.bl_desc=new F(t.bl_tree,R),t.bi_buf=0,t.bi_valid=0,W(t)},r._tr_stored_block=J,r._tr_flush_block=function(t,e,r,i){var n,s,a=0;0<t.level?(2===t.strm.data_type&&(t.strm.data_type=function(t){var e,r=4093624447;for(e=0;e<=31;e++,r>>>=1)if(1&r&&0!==t.dyn_ltree[2*e])return o;if(0!==t.dyn_ltree[18]||0!==t.dyn_ltree[20]||0!==t.dyn_ltree[26])return h;for(e=32;e<u;e++)if(0!==t.dyn_ltree[2*e])return h;return o}(t)),Y(t,t.l_desc),Y(t,t.d_desc),a=function(t){var e;for(X(t,t.dyn_ltree,t.l_desc.max_code),X(t,t.dyn_dtree,t.d_desc.max_code),Y(t,t.bl_desc),e=d-1;3<=e&&0===t.bl_tree[2*S[e]+1];e--);return t.opt_len+=3*(e+1)+5+5+4,e}(t),n=t.opt_len+3+7>>>3,(s=t.static_len+3+7>>>3)<=n&&(n=s)):n=s=r+5,r+4<=n&&-1!==e?J(t,e,r,i):4===t.strategy||s===n?(P(t,2+(i?1:0),3),K(t,z,C)):(P(t,4+(i?1:0),3),function(t,e,r,i){var n;for(P(t,e-257,5),P(t,r-1,5),P(t,i-4,4),n=0;n<i;n++)P(t,t.bl_tree[2*S[n]+1],3);V(t,t.dyn_ltree,e-1),V(t,t.dyn_dtree,r-1)}(t,t.l_desc.max_code+1,t.d_desc.max_code+1,a+1),K(t,t.dyn_ltree,t.dyn_dtree)),W(t),i&&M(t)},r._tr_tally=function(t,e,r){return t.pending_buf[t.d_buf+2*t.last_lit]=e>>>8&255,t.pending_buf[t.d_buf+2*t.last_lit+1]=255&e,t.pending_buf[t.l_buf+t.last_lit]=255&r,t.last_lit++,0===e?t.dyn_ltree[2*r]++:(t.matches++,e--,t.dyn_ltree[2*(A[r]+u+1)]++,t.dyn_dtree[2*N(e)]++),t.last_lit===t.lit_bufsize-1},r._tr_align=function(t){P(t,2,3),L(t,m,z),function(t){16===t.bi_valid?(U(t,t.bi_buf),t.bi_buf=0,t.bi_valid=0):8<=t.bi_valid&&(t.pending_buf[t.pending++]=255&t.bi_buf,t.bi_buf>>=8,t.bi_valid-=8)}(t)}},{"../utils/common":41}],53:[function(t,e,r){"use strict";e.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(t,e,r){"use strict";e.exports="function"==typeof setImmediate?setImmediate:function(){var t=[].slice.apply(arguments);t.splice(1,0,0),setTimeout.apply(null,t)}},{}]},{},[10])(10)});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/el.js b/cps/static/js/libs/tinymce/langs/el.js
new file mode 100644
index 00000000..b5f840da
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/el.js
@@ -0,0 +1,261 @@
+tinymce.addI18n('el',{
+"Redo": "\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7",
+"Undo": "\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7",
+"Cut": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae",
+"Copy": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Paste": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7",
+"Select all": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03cc\u03bb\u03c9\u03bd",
+"New document": "\u039d\u03ad\u03bf \u03ad\u03b3\u03b3\u03c1\u03b1\u03c6\u03bf",
+"Ok": "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9",
+"Cancel": "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
+"Visual aids": "O\u03c0\u03c4\u03b9\u03ba\u03ac \u03b2\u03bf\u03b7\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 ",
+"Bold": "\u0388\u03bd\u03c4\u03bf\u03bd\u03b7",
+"Italic": "\u03a0\u03bb\u03ac\u03b3\u03b9\u03b1",
+"Underline": "\u03a5\u03c0\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b9\u03c3\u03b7",
+"Strikethrough": "\u0394\u03b9\u03b1\u03ba\u03c1\u03b9\u03c4\u03ae \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Superscript": "\u0395\u03ba\u03b8\u03ad\u03c4\u03b7\u03c2",
+"Subscript": "\u0394\u03b5\u03af\u03ba\u03c4\u03b7\u03c2",
+"Clear formatting": "\u0391\u03c0\u03b1\u03bb\u03bf\u03b9\u03c6\u03ae \u03bc\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
+"Align left": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Align center": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03c3\u03c4\u03bf \u03ba\u03ad\u03bd\u03c4\u03c1\u03bf",
+"Align right": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Justify": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03c3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Bullet list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03bc\u03b5 \u03ba\u03bf\u03c5\u03ba\u03ba\u03af\u03b4\u03b5\u03c2",
+"Numbered list": "\u0391\u03c1\u03b9\u03b8\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1",
+"Decrease indent": "\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
+"Increase indent": "\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
+"Close": "\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf",
+"Formats": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u039f \u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03b9 \u03ac\u03bc\u03b5\u03c3\u03b7 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c7\u03b5\u03b9\u03c1\u03bf. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03af\u03bf\u03c5 Ctrl+X\/C\/V.",
+"Headers": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
+"Header 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
+"Header 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
+"Header 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
+"Header 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
+"Header 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
+"Header 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
+"Headings": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
+"Heading 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
+"Heading 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
+"Heading 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
+"Heading 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
+"Heading 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
+"Heading 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
+"Preformatted": "\u03a0\u03c1\u03bf\u03b4\u03b9\u03b1\u03bc\u03bf\u03c1\u03c6\u03c9\u03bc\u03ad\u03bd\u03bf",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
+"Paragraph": "\u03a0\u03b1\u03c1\u03ac\u03b3\u03c1\u03b1\u03c6\u03bf\u03c2",
+"Blockquote": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u03c0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2",
+"Inline": "\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03b7",
+"Blocks": "\u03a4\u03bc\u03ae\u03bc\u03b1\u03c4\u03b1",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0397 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c4\u03ce\u03c1\u03b1 \u03c3\u03b5 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c0\u03bb\u03bf\u03cd \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a4\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03b1 \u03bc\u03b9\u03b1\u03c2 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7\u03c2 \u03b8\u03b1 \u03b5\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03bf\u03cd\u03bd\u03c4\u03b1\u03b9 \u03c9\u03c2 \u03b1\u03c0\u03bb\u03cc \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03cc\u03c3\u03bf \u03b7 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c5\u03c4\u03ae \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03bd\u03b5\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03ae.",
+"Font Family": "\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac",
+"Font Sizes": "\u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2",
+"Class": "\u039a\u03bb\u03ac\u03c3\u03b7",
+"Browse for an image": "\u0391\u03bd\u03b1\u03b6\u03b7\u03c4\u03ae\u03c3\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1",
+"OR": "\u0389",
+"Drop an image here": "\u03a1\u03af\u03be\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1 \u03b5\u03b4\u03ce",
+"Upload": "\u039c\u03b5\u03c4\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7",
+"Block": "\u03a4\u03bc\u03ae\u03bc\u03b1",
+"Align": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Default": "\u03a0\u03c1\u03bf\u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf",
+"Circle": "\u039a\u03cd\u03ba\u03bb\u03bf\u03c2",
+"Disc": "\u0394\u03af\u03c3\u03ba\u03bf\u03c2",
+"Square": "\u03a4\u03b5\u03c4\u03c1\u03ac\u03b3\u03c9\u03bd\u03bf",
+"Lower Alpha": "\u03a0\u03b5\u03b6\u03ac \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
+"Lower Greek": "\u03a0\u03b5\u03b6\u03ac \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac",
+"Lower Roman": "\u03a0\u03b5\u03b6\u03ac \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
+"Upper Alpha": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
+"Upper Roman": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
+"Anchor": "\u0391\u03b3\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
+"Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
+"Id": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u039f \u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b1\u03c1\u03c7\u03af\u03b6\u03b5\u03b9 \u03bc\u03b5 \u03ad\u03bd\u03b1 \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1, \u03b1\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03bc\u03cc\u03bd\u03bf \u03b1\u03c0\u03cc \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1\u03c4\u03b1, \u03b1\u03c1\u03b9\u03b8\u03bc\u03bf\u03cd\u03c2, \u03c0\u03b1\u03cd\u03bb\u03b5\u03c2, \u03c4\u03b5\u03bb\u03b5\u03af\u03b5\u03c2, \u03ac\u03bd\u03c9 \u03c4\u03b5\u03bb\u03b5\u03af\u03b1 \u03ae \u03c5\u03c0\u03bf\u03b3\u03c1\u03b1\u03bc\u03bc\u03af\u03c3\u03b5\u03b9\u03c2.",
+"You have unsaved changes are you sure you want to navigate away?": "\u0388\u03c7\u03b5\u03c4\u03b5 \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2. \u0395\u03af\u03c3\u03c4\u03b5 \u03b2\u03ad\u03b2\u03b1\u03b9\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c6\u03cd\u03b3\u03b5\u03c4\u03b5 \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03c3\u03b5\u03bb\u03af\u03b4\u03b1;",
+"Restore last draft": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf\u03c5 \u03c3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5",
+"Special character": "\u0395\u03b9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03b1\u03c2",
+"Source code": "\u03a0\u03b7\u03b3\u03b1\u03af\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
+"Insert\/Edit code sample": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1",
+"Language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
+"Code sample": "\u0394\u03b5\u03af\u03b3\u03bc\u03b1 \u039a\u03ce\u03b4\u03b9\u03ba\u03b1",
+"Color": "\u03a7\u03c1\u03ce\u03bc\u03b1",
+"R": "\u03ba",
+"G": "\u03a0",
+"B": "\u039c",
+"Left to right": "\u0391\u03c0\u03cc \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Right to left": "\u0391\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Emoticons": "\u03a6\u03b1\u03c4\u03c3\u03bf\u03cd\u03bb\u03b5\u03c2",
+"Document properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b5\u03b3\u03b3\u03c1\u03ac\u03c6\u03bf\u03c5",
+"Title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
+"Keywords": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03ac",
+"Description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Robots": "\u03a1\u03bf\u03bc\u03c0\u03cc\u03c4",
+"Author": "\u03a3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7\u03c2",
+"Encoding": "\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Fullscreen": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7",
+"Action": "\u0395\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b1",
+"Shortcut": "\u03a3\u03c5\u03bd\u03c4\u03cc\u03bc\u03b5\u03c5\u03c3\u03b7",
+"Help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
+"Address": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7",
+"Focus to menubar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd",
+"Focus to toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
+"Focus to element path": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf\u03c5",
+"Focus to contextual toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
+"Insert link (if link plugin activated)": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03bf\u03c5 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5)",
+"Save (if save plugin activated)": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2)",
+"Find (if searchreplace plugin activated)": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7\u03c2)",
+"Plugins installed ({0}):": "\u0395\u03b3\u03ba\u03b1\u03c4\u03b5\u03c3\u03c4\u03b7\u03bc\u03ad\u03bd\u03b1 \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 ({0}):",
+"Premium plugins:": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 \u03c5\u03c8\u03b7\u03bb\u03ae\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2:",
+"Learn more...": "\u039c\u03ac\u03b8\u03b5\u03c4\u03b5 \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b1...",
+"You are using {0}": "\u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b5 {0}",
+"Plugins": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1",
+"Handy Shortcuts": "\u03a7\u03c1\u03ae\u03c3\u03b9\u03bc\u03b5\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2",
+"Horizontal line": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae",
+"Insert\/edit image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Image description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Source": "\u03a0\u03b7\u03b3\u03ae",
+"Dimensions": "\u0394\u03b9\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2",
+"Constrain proportions": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b1\u03bd\u03b1\u03bb\u03bf\u03b3\u03b9\u03ce\u03bd",
+"General": "\u0393\u03b5\u03bd\u03b9\u03ba\u03ac",
+"Advanced": "\u0393\u03b9\u03b1 \u03a0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2",
+"Style": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
+"Vertical space": "\u039a\u03ac\u03b8\u03b5\u03c4\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
+"Horizontal space": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
+"Border": "\u03a0\u03bb\u03b1\u03af\u03c3\u03b9\u03bf",
+"Insert image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Image": "\u0395\u03b9\u03ba\u03cc\u03bd\u03b1",
+"Image list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd",
+"Rotate counterclockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
+"Rotate clockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b4\u03b5\u03be\u03b9\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
+"Flip vertically": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03ba\u03b1\u03b8\u03ad\u03c4\u03c9\u03c2",
+"Flip horizontally": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03bf\u03c1\u03b9\u03b6\u03bf\u03bd\u03c4\u03af\u03c9\u03c2",
+"Edit image": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Image options": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Zoom in": "\u039c\u03b5\u03b3\u03ad\u03b8\u03c5\u03bd\u03c3\u03b7",
+"Zoom out": "\u03a3\u03bc\u03af\u03ba\u03c1\u03c5\u03bd\u03c3\u03b7",
+"Crop": "\u03a0\u03b5\u03c1\u03b9\u03ba\u03bf\u03c0\u03ae",
+"Resize": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03bc\u03b5\u03b3\u03ad\u03b8\u03bf\u03c5\u03c2",
+"Orientation": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03bd\u03b1\u03c4\u03bf\u03bb\u03b9\u03c3\u03bc\u03cc\u03c2",
+"Brightness": "\u03a6\u03c9\u03c4\u03b5\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
+"Sharpen": "\u038c\u03be\u03c5\u03bd\u03c3\u03b7",
+"Contrast": "\u0391\u03bd\u03c4\u03af\u03b8\u03b5\u03c3\u03b7",
+"Color levels": "\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03b1 \u03c7\u03c1\u03ce\u03bc\u03b1\u03c4\u03bf\u03c2",
+"Gamma": "\u0393\u03ac\u03bc\u03bc\u03b1",
+"Invert": "\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae",
+"Apply": "\u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae",
+"Back": "\u03a0\u03af\u03c3\u03c9",
+"Insert date\/time": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\u03c2\/\u03ce\u03c1\u03b1\u03c2",
+"Date\/time": "\u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\/\u03ce\u03c1\u03b1",
+"Insert link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Insert\/edit link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Text to display": "\u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03b3\u03b9\u03b1 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
+"Url": "URL",
+"Target": "\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
+"None": "\u039a\u03b1\u03bc\u03af\u03b1",
+"New window": "\u039d\u03ad\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf",
+"Remove link": "\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Anchors": "\u0386\u03b3\u03ba\u03c5\u03c1\u03b5\u03c2",
+"Link": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2",
+"Paste or type a link": "\u0395\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03ae\u03c3\u03c4\u03b5 \u03ae \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03ae\u03c3\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 email. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 mailto:;",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 http:\/\/;",
+"Link list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03c9\u03bd",
+"Insert video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
+"Insert\/edit video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
+"Insert\/edit media": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 media",
+"Alternative source": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7",
+"Poster": "\u0391\u03c6\u03af\u03c3\u03b1",
+"Paste your embed code below:": "\u0395\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9:",
+"Embed": "\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7",
+"Media": "\u039c\u03ad\u03c3\u03b1 (\u03bc\u03af\u03bd\u03c4\u03b9\u03b1)",
+"Nonbreaking space": "\u039a\u03b5\u03bd\u03cc \u03c7\u03c9\u03c1\u03af\u03c2 \u03b4\u03b9\u03b1\u03ba\u03bf\u03c0\u03ae",
+"Page break": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2",
+"Paste as text": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03c9\u03c2 \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf",
+"Preview": "\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7",
+"Print": "\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7",
+"Save": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7",
+"Find": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7",
+"Replace with": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03bc\u03b5",
+"Replace": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
+"Replace all": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03cc\u03bb\u03c9\u03bd",
+"Prev": "\u03a0\u03c1\u03bf\u03b7\u03b3.",
+"Next": "\u0395\u03c0\u03cc\u03bc.",
+"Find and replace": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
+"Could not find the specified string.": "\u0394\u03b5\u03bd \u03ae\u03c4\u03b1\u03bd \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03bb\u03c6\u03b1\u03c1\u03b9\u03b8\u03bc\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd.",
+"Match case": "\u03a4\u03b1\u03af\u03c1\u03b9\u03b1\u03c3\u03bc\u03b1 \u03c0\u03b5\u03b6\u03ce\u03bd\/\u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03c9\u03bd",
+"Whole words": "\u039f\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03b5\u03c2 \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
+"Spellcheck": "\u039f\u03c1\u03b8\u03bf\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 ",
+"Ignore": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7",
+"Ignore all": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7 \u03cc\u03bb\u03c9\u03bd",
+"Finish": "\u03a4\u03ad\u03bb\u03bf\u03c2",
+"Add to Dictionary": "\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c3\u03c4\u03bf \u039b\u03b5\u03be\u03b9\u03ba\u03cc",
+"Insert table": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Table properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Delete table": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Cell": "\u039a\u03b5\u03bb\u03af",
+"Row": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ae",
+"Column": "\u03a3\u03c4\u03ae\u03bb\u03b7",
+"Cell properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Merge cells": "\u03a3\u03c5\u03b3\u03c7\u03ce\u03bd\u03b5\u03c5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Split cell": "\u0394\u03b9\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Insert row before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
+"Insert row after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
+"Delete row": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Row properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Cut row": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Copy row": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Paste row before": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
+"Paste row after": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
+"Insert column before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Insert column after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Delete column": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2",
+"Cols": "\u03a3\u03c4\u03ae\u03bb\u03b5\u03c2",
+"Rows": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2",
+"Width": "\u03a0\u03bb\u03ac\u03c4\u03bf\u03c2",
+"Height": "\u038e\u03c8\u03bf\u03c2",
+"Cell spacing": "\u0391\u03c0\u03cc\u03c3\u03c4\u03b1\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Cell padding": "\u0391\u03bd\u03b1\u03c0\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Caption": "\u039b\u03b5\u03b6\u03ac\u03bd\u03c4\u03b1",
+"Left": "\u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Center": "\u039a\u03b5\u03bd\u03c4\u03c1\u03b1\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7",
+"Right": "\u0394\u03b5\u03be\u03b9\u03ac",
+"Cell type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Scope": "\u0388\u03ba\u03c4\u03b1\u03c3\u03b7",
+"Alignment": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"H Align": "\u039f\u03c1. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"V Align": "\u039a. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Top": "\u039a\u03bf\u03c1\u03c5\u03c6\u03ae",
+"Middle": "\u039c\u03ad\u03c3\u03b7",
+"Bottom": "\u039a\u03ac\u03c4\u03c9",
+"Header cell": "\u039a\u03b5\u03bb\u03af-\u03ba\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
+"Row group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ce\u03bd",
+"Column group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03c3\u03c4\u03b7\u03bb\u03ce\u03bd",
+"Row type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Header": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
+"Body": "\u03a3\u03ce\u03bc\u03b1",
+"Footer": "\u03a5\u03c0\u03bf\u03c3\u03ad\u03bb\u03b9\u03b4\u03bf",
+"Border color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c0\u03bb\u03b1\u03b9\u03c3\u03af\u03bf\u03c5",
+"Insert template": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03c1\u03bf\u03c4\u03cd\u03c0\u03bf\u03c5 ",
+"Templates": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03b1",
+"Template": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf",
+"Text color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 ",
+"Background color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c6\u03cc\u03bd\u03c4\u03bf\u03c5",
+"Custom...": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae...",
+"Custom color": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03c3\u03bc\u03ad\u03bd\u03bf \u03c7\u03c1\u03ce\u03bc\u03b1",
+"No color": "\u03a7\u03c9\u03c1\u03af\u03c2 \u03c7\u03c1\u03ce\u03bc\u03b1",
+"Table of Contents": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 \u03a0\u03b5\u03c1\u03b9\u03b5\u03c7\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd",
+"Show blocks": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03bc\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd",
+"Show invisible characters": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03ba\u03c1\u03c5\u03c6\u03ce\u03bd \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd",
+"Words: {0}": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2: {0}",
+"{0} words": "{0} \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
+"File": "\u0391\u03c1\u03c7\u03b5\u03af\u03bf",
+"Edit": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1",
+"Insert": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae",
+"View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
+"Format": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Table": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2",
+"Tools": "\u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03b1",
+"Powered by {0}": "\u03a4\u03c1\u03bf\u03c6\u03bf\u03b4\u03bf\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b1\u03c0\u03cc {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u0395\u03bc\u03c0\u03bb\u03bf\u03c5\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F9 \u03b3\u03b9\u03b1 \u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F10 \u03b3\u03b9\u03b1  \u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-0 \u03b3\u03b9\u03b1 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1"
+});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/tr.js b/cps/static/js/libs/tinymce/langs/tr.js
new file mode 100644
index 00000000..200a15f1
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/tr.js
@@ -0,0 +1,419 @@
+tinymce.addI18n('tr',{
+"Redo": "Yinele",
+"Undo": "Geri al",
+"Cut": "Kes",
+"Copy": "Kopyala",
+"Paste": "Yap\u0131\u015ft\u0131r",
+"Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
+"New document": "Yeni dok\u00fcman",
+"Ok": "Tamam",
+"Cancel": "\u0130ptal",
+"Visual aids": "G\u00f6rsel ara\u00e7lar",
+"Bold": "Kal\u0131n",
+"Italic": "\u0130talik",
+"Underline": "Alt\u0131 \u00e7izili",
+"Strikethrough": "\u00dcst\u00fc \u00e7izgili",
+"Superscript": "\u00dcst simge",
+"Subscript": "Alt simge",
+"Clear formatting": "Bi\u00e7imi temizle",
+"Align left": "Sola hizala",
+"Align center": "Ortala",
+"Align right": "Sa\u011fa hizala",
+"Justify": "\u0130ki yana yasla",
+"Bullet list": "S\u0131ras\u0131z liste",
+"Numbered list": "S\u0131ral\u0131 liste",
+"Decrease indent": "Girintiyi azalt",
+"Increase indent": "Girintiyi art\u0131r",
+"Close": "Kapat",
+"Formats": "Bi\u00e7imler",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Taray\u0131c\u0131n\u0131z panoya direk eri\u015fimi desteklemiyor. L\u00fctfen Ctrl+X\/C\/V klavye k\u0131sayollar\u0131n\u0131 kullan\u0131n.",
+"Headers": "Ba\u015fl\u0131klar",
+"Header 1": "Ba\u015fl\u0131k 1",
+"Header 2": "Ba\u015fl\u0131k 2",
+"Header 3": "Ba\u015fl\u0131k 3",
+"Header 4": "Ba\u015fl\u0131k 4",
+"Header 5": "Ba\u015fl\u0131k 5",
+"Header 6": "Ba\u015fl\u0131k 6",
+"Headings": "Ba\u015fl\u0131klar",
+"Heading 1": "Ba\u015fl\u0131k 1",
+"Heading 2": "Ba\u015fl\u0131k 2",
+"Heading 3": "Ba\u015fl\u0131k 3",
+"Heading 4": "Ba\u015fl\u0131k 4",
+"Heading 5": "Ba\u015fl\u0131k 5",
+"Heading 6": "Ba\u015fl\u0131k 6",
+"Preformatted": "\u00d6nceden bi\u00e7imlendirilmi\u015f",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "Kod",
+"Paragraph": "Paragraf",
+"Blockquote": "Blockquote",
+"Inline": "Sat\u0131r i\u00e7i",
+"Blocks": "Bloklar",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00fcz metin modunda yap\u0131\u015ft\u0131r. Bu se\u00e7ene\u011fi kapatana kadar i\u00e7erikler d\u00fcz metin olarak yap\u0131\u015ft\u0131r\u0131l\u0131r.",
+"Fonts": "Yaz\u0131 Tipleri",
+"Font Sizes": "Yaz\u0131tipi B\u00fcy\u00fckl\u00fc\u011f\u00fc",
+"Class": "S\u0131n\u0131f",
+"Browse for an image": "Bir resim aray\u0131n",
+"OR": "VEYA",
+"Drop an image here": "Buraya bir resim koyun",
+"Upload": "Y\u00fckle",
+"Block": "Blok",
+"Align": "Hizala",
+"Default": "Varsay\u0131lan",
+"Circle": "Daire",
+"Disc": "Disk",
+"Square": "Kare",
+"Lower Alpha": "K\u00fc\u00e7\u00fck Harf",
+"Lower Greek": "K\u00fc\u00e7\u00fck Yunan Harfleri",
+"Lower Roman": "K\u00fc\u00e7\u00fck Roman Harfleri ",
+"Upper Alpha": "B\u00fcy\u00fck Harf",
+"Upper Roman": "B\u00fcy\u00fck Roman Harfleri ",
+"Anchor...": "\u00c7apa...",
+"Name": "\u0130sim",
+"Id": "Kimlik",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id bir harf ile ba\u015flamal\u0131d\u0131r ve harf, rakam, \u00e7izgi, nokta, iki nokta \u00fcst\u00fcste veya alt \u00e7izgi kullan\u0131labilir.",
+"You have unsaved changes are you sure you want to navigate away?": "Kaydedilmemi\u015f de\u011fi\u015fiklikler var, sayfadan ayr\u0131lmak istedi\u011finize emin misiniz?",
+"Restore last draft": "Son tasla\u011f\u0131 geri y\u00fckle",
+"Special character...": "\u00d6zel karakter...",
+"Source code": "Kaynak kodu",
+"Insert\/Edit code sample": "\u00d6rnek kod ekle\/d\u00fczenle",
+"Language": "Dil",
+"Code sample...": "Kod \u00f6rne\u011fi...",
+"Color Picker": "Renk Se\u00e7ici",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "Soldan sa\u011fa",
+"Right to left": "Sa\u011fdan sola",
+"Emoticons...": "\u0130fadeler...",
+"Metadata and Document Properties": "\u00d6nbilgi ve Belge \u00d6zellikleri",
+"Title": "Ba\u015fl\u0131k",
+"Keywords": "Anahtar kelimeler",
+"Description": "A\u00e7\u0131klama",
+"Robots": "Robotlar",
+"Author": "Yazar",
+"Encoding": "Kodlama",
+"Fullscreen": "Tam ekran",
+"Action": "Eylem",
+"Shortcut": "K\u0131sayol",
+"Help": "Yard\u0131m",
+"Address": "Adres",
+"Focus to menubar": "Men\u00fcye odaklan",
+"Focus to toolbar": "Ara\u00e7 tak\u0131m\u0131na odaklan",
+"Focus to element path": "\u00d6\u011fe yoluna odaklan",
+"Focus to contextual toolbar": "Ba\u011flamsal ara\u00e7 tak\u0131m\u0131na odaklan",
+"Insert link (if link plugin activated)": "Ba\u011flant\u0131 ekle (Ba\u011flant\u0131 eklentisi aktif ise)",
+"Save (if save plugin activated)": "Kaydet (Kay\u0131t eklentisi aktif ise)",
+"Find (if searchreplace plugin activated)": "Bul (Bul\/De\u011fi\u015ftir eklentisi aktif ise)",
+"Plugins installed ({0}):": "Eklentiler y\u00fcklendi ({0}):",
+"Premium plugins:": "Premium eklentiler:",
+"Learn more...": "Detayl\u0131 bilgi...",
+"You are using {0}": "\u015eu an {0} kullan\u0131yorsunuz",
+"Plugins": "Plugins",
+"Handy Shortcuts": "Handy Shortcuts",
+"Horizontal line": "Yatay \u00e7izgi",
+"Insert\/edit image": "Resim ekle\/d\u00fczenle",
+"Image description": "Resim a\u00e7\u0131klamas\u0131",
+"Source": "Kaynak",
+"Dimensions": "Boyutlar",
+"Constrain proportions": "Oranlar\u0131 koru",
+"General": "Genel",
+"Advanced": "Geli\u015fmi\u015f",
+"Style": "Stil",
+"Vertical space": "Dikey bo\u015fluk",
+"Horizontal space": "Yatay bo\u015fluk",
+"Border": "Kenarl\u0131k",
+"Insert image": "Resim ekle",
+"Image...": "Resim...",
+"Image list": "G\u00f6rsel listesi",
+"Rotate counterclockwise": "Saatin tersi y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
+"Rotate clockwise": "Saat y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
+"Flip vertically": "Dikine \u00e7evir",
+"Flip horizontally": "Enine \u00e7evir",
+"Edit image": "Resmi d\u00fczenle",
+"Image options": "Resim ayarlar\u0131",
+"Zoom in": "Yak\u0131nla\u015ft\u0131r",
+"Zoom out": "Uzakla\u015ft\u0131r",
+"Crop": "K\u0131rp",
+"Resize": "Yeniden Boyutland\u0131r",
+"Orientation": "Oryantasyon",
+"Brightness": "Parlakl\u0131k",
+"Sharpen": "Keskinle\u015ftir",
+"Contrast": "Kontrast",
+"Color levels": "Renk d\u00fczeyleri",
+"Gamma": "Gama",
+"Invert": "Ters \u00c7evir",
+"Apply": "Uygula",
+"Back": "Geri",
+"Insert date\/time": "Tarih\/saat ekle",
+"Date\/time": "Tarih\/saat",
+"Insert\/Edit Link": "Ba\u011flant\u0131 Ekle\/D\u00fczenle",
+"Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
+"Text to display": "Yaz\u0131y\u0131 g\u00f6r\u00fcnt\u00fcle",
+"Url": "Url",
+"Open link in...": "Ba\u011flant\u0131y\u0131 a\u00e7...",
+"Current window": "Mevcut pencere",
+"None": "Hi\u00e7biri",
+"New window": "Yeni pencere",
+"Remove link": "Ba\u011flant\u0131y\u0131 kald\u0131r",
+"Anchors": "\u00c7apalar",
+"Link...": "Ba\u011flant\u0131...",
+"Paste or type a link": "Bir ba\u011flant\u0131 yaz\u0131n yada yap\u0131\u015ft\u0131r\u0131n",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Girdi\u011finiz URL bir e-posta adresi gibi g\u00f6r\u00fcn\u00fcyor. Gerekli olan mailto: \u00f6nekini eklemek ister misiniz?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Girdi\u011finiz URL bir d\u0131\u015f ba\u011flant\u0131 gibi g\u00f6r\u00fcn\u00fcyor. Gerekli olan http:\/\/ \u00f6nekini eklemek ister misiniz?",
+"Link list": "Ba\u011flant\u0131 listesi",
+"Insert video": "Video ekle",
+"Insert\/edit video": "Video ekle\/d\u00fczenle",
+"Insert\/edit media": "Medya ekle\/d\u00fczenle",
+"Alternative source": "Alternatif kaynak",
+"Alternative source URL": "Alternatif kaynak URL",
+"Media poster (Image URL)": "Medya posteri (Resim URL)",
+"Paste your embed code below:": "Video g\u00f6mme kodunu a\u015fa\u011f\u0131ya yap\u0131\u015ft\u0131r\u0131n\u0131z:",
+"Embed": "G\u00f6mme",
+"Media...": "Medya...",
+"Nonbreaking space": "B\u00f6l\u00fcnemez bo\u015fluk",
+"Page break": "Sayfa sonu",
+"Paste as text": "Metin olarak yap\u0131\u015ft\u0131r",
+"Preview": "\u00d6nizleme",
+"Print...": "Yazd\u0131r...",
+"Save": "Kaydet",
+"Find": "Bul",
+"Replace with": "Bununla de\u011fi\u015ftir",
+"Replace": "De\u011fi\u015ftir",
+"Replace all": "T\u00fcm\u00fcn\u00fc de\u011fi\u015ftir",
+"Previous": "Geri",
+"Next": "Sonraki",
+"Find and replace...": "Bul ve de\u011fi\u015ftir...",
+"Could not find the specified string.": "Herhangi bir sonu\u00e7 bulunamad\u0131.",
+"Match case": "B\u00fcy\u00fck\/k\u00fc\u00e7\u00fck harf duyarl\u0131",
+"Find whole words only": "Sadece t\u00fcm kelimeyi ara",
+"Spell check": "Yaz\u0131m denetimi",
+"Ignore": "Yoksay",
+"Ignore all": "T\u00fcm\u00fcn\u00fc yoksay",
+"Finish": "Bitir",
+"Add to Dictionary": "S\u00f6zl\u00fc\u011fe Ekle",
+"Insert table": "Tablo ekle",
+"Table properties": "Tablo \u00f6zellikleri",
+"Delete table": "Tablo sil",
+"Cell": "H\u00fccre",
+"Row": "Sat\u0131r",
+"Column": "S\u00fctun",
+"Cell properties": "H\u00fccre \u00f6zellikleri",
+"Merge cells": "H\u00fccreleri birle\u015ftir",
+"Split cell": "H\u00fccre b\u00f6l",
+"Insert row before": "\u00dcste sat\u0131r ekle",
+"Insert row after": "Alta sat\u0131r ekle ",
+"Delete row": "Sat\u0131r sil",
+"Row properties": "Sat\u0131r \u00f6zellikleri",
+"Cut row": "Sat\u0131r\u0131 kes",
+"Copy row": "Sat\u0131r\u0131 kopyala",
+"Paste row before": "\u00dcste sat\u0131r yap\u0131\u015ft\u0131r",
+"Paste row after": "Alta sat\u0131r yap\u0131\u015ft\u0131r",
+"Insert column before": "Sola s\u00fctun ekle",
+"Insert column after": "Sa\u011fa s\u00fctun ekle",
+"Delete column": "S\u00fctun sil",
+"Cols": "S\u00fctunlar",
+"Rows": "Sat\u0131rlar",
+"Width": "Geni\u015flik",
+"Height": "Y\u00fckseklik",
+"Cell spacing": "H\u00fccre aral\u0131\u011f\u0131",
+"Cell padding": "H\u00fccre dolgusu",
+"Show caption": "Ba\u015fl\u0131\u011f\u0131 g\u00f6ster",
+"Left": "Sol",
+"Center": "Orta",
+"Right": "Sa\u011f",
+"Cell type": "H\u00fccre tipi",
+"Scope": "Kapsam",
+"Alignment": "Hizalama",
+"H Align": "Yatay Hizalama",
+"V Align": "Dikey Hizalama",
+"Top": "\u00dcst",
+"Middle": "Orta",
+"Bottom": "Alt",
+"Header cell": "Ba\u015fl\u0131k h\u00fccresi",
+"Row group": "Sat\u0131r grubu",
+"Column group": "S\u00fctun grubu",
+"Row type": "Sat\u0131r tipi",
+"Header": "Ba\u015fl\u0131k",
+"Body": "G\u00f6vde",
+"Footer": "Alt",
+"Border color": "Kenarl\u0131k rengi",
+"Insert template...": "\u015eablon ekle...",
+"Templates": "\u015eablonlar",
+"Template": "Taslak",
+"Text color": "Yaz\u0131 rengi",
+"Background color": "Arka plan rengi",
+"Custom...": "\u00d6zel...",
+"Custom color": "\u00d6zel renk",
+"No color": "Renk yok",
+"Remove color": "Rengi kald\u0131r",
+"Table of Contents": "\u0130\u00e7erik tablosu",
+"Show blocks": "Bloklar\u0131 g\u00f6ster",
+"Show invisible characters": "G\u00f6r\u00fcnmez karakterleri g\u00f6ster",
+"Word count": "Kelime say\u0131s\u0131",
+"Count": "Say\u0131m",
+"Document": "Belge",
+"Selection": "Se\u00e7im",
+"Words": "S\u00f6zc\u00fck",
+"Words: {0}": "Kelime: {0}",
+"{0} words": "{0} words",
+"File": "Dosya",
+"Edit": "D\u00fczenle",
+"Insert": "Ekle",
+"View": "G\u00f6r\u00fcn\u00fcm",
+"Format": "Bi\u00e7im",
+"Table": "Tablo",
+"Tools": "Ara\u00e7lar",
+"Powered by {0}": "Powered by {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 tu\u015funa bas\u0131n\u0131z. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 tu\u015funa bas\u0131n\u0131z. Yard\u0131m i\u00e7in ALT-0 tu\u015funa bas\u0131n\u0131z.",
+"Image title": "Resim ba\u015fl\u0131\u011f\u0131",
+"Border width": "Kenar geni\u015fli\u011fi",
+"Border style": "Kenar sitili",
+"Error": "Hata",
+"Warn": "Uyar\u0131",
+"Valid": "Ge\u00e7erli",
+"To open the popup, press Shift+Enter": "Popup'\u0131 a\u00e7mak i\u00e7in Shift+Enter'a bas\u0131n",
+"Rich Text Area. Press ALT-0 for help.": "Zengin Metin Alan\u0131. Yard\u0131m i\u00e7in Alt-0'a bas\u0131n.",
+"System Font": "Sistem Yaz\u0131 Tipi",
+"Failed to upload image: {0}": "Resim y\u00fcklenemedi: {0}",
+"Failed to load plugin: {0} from url {1}": "Eklenti y\u00fcklenemedi: {1} url\u2019sinden {0}",
+"Failed to load plugin url: {0}": "Url eklentisi y\u00fcklenemedi: {0}",
+"Failed to initialize plugin: {0}": "Eklenti ba\u015flat\u0131lamad\u0131: {0}",
+"example": "\u00f6rnek",
+"Search": "Ara",
+"All": "T\u00fcm\u00fc",
+"Currency": "Para birimi",
+"Text": "Metin",
+"Quotations": "Al\u0131nt\u0131",
+"Mathematical": "Matematik",
+"Extended Latin": "Uzat\u0131lm\u0131\u015f Latin",
+"Symbols": "Semboller",
+"Arrows": "Oklar",
+"User Defined": "Kullan\u0131c\u0131 Tan\u0131ml\u0131",
+"dollar sign": "dolar i\u015fareti",
+"currency sign": "para birimi i\u015fareti",
+"euro-currency sign": "euro para birimi i\u015fareti",
+"colon sign": "colon i\u015fareti",
+"cruzeiro sign": "cruzeiro i\u015fareti",
+"french franc sign": "frans\u0131z frang\u0131 i\u015fareti",
+"lira sign": "lira i\u015fareti",
+"mill sign": "mill i\u015fareti",
+"naira sign": "naira i\u015fareti",
+"peseta sign": "peseta i\u015fareti",
+"rupee sign": "rupi i\u015fareti",
+"won sign": "won i\u015fareti",
+"new sheqel sign": "yeni \u015fekel i\u015fareti",
+"dong sign": "dong i\u015fareti",
+"kip sign": "kip i\u015fareti",
+"tugrik sign": "tugrik i\u015fareti",
+"drachma sign": "drahma i\u015fareti",
+"german penny symbol": "alman kuru\u015f sembol\u00fc",
+"peso sign": "peso i\u015fareti",
+"guarani sign": "guarani i\u015fareti",
+"austral sign": "austral i\u015fareti",
+"hryvnia sign": "hrivniya i\u015fareti",
+"cedi sign": "cedi i\u015fareti",
+"livre tournois sign": "livre tournois i\u015fareti",
+"spesmilo sign": "spesmilo i\u015fareti",
+"tenge sign": "tenge i\u015fareti",
+"indian rupee sign": "hindistan rupisi i\u015fareti",
+"turkish lira sign": "t\u00fcrk liras\u0131 i\u015fareti",
+"nordic mark sign": "nordic i\u015fareti",
+"manat sign": "manat i\u015fareti",
+"ruble sign": "ruble i\u015fareti",
+"yen character": "yen karakteri",
+"yuan character": "yuan karakteri",
+"yuan character, in hong kong and taiwan": "yuan karakteri, hong kong ve tayvan'da kullan\u0131lan",
+"yen\/yuan character variant one": "yen\/yuan karakter de\u011fi\u015fkeni",
+"Loading emoticons...": "\u0130fadeler y\u00fckleniyor...",
+"Could not load emoticons": "\u0130fadeler y\u00fcklenemedi",
+"People": "\u0130nsan",
+"Animals and Nature": "Hayvanlar ve Do\u011fa",
+"Food and Drink": "Yiyecek ve \u0130\u00e7ecek",
+"Activity": "Etkinlik",
+"Travel and Places": "Gezi ve Yerler",
+"Objects": "Nesneler",
+"Flags": "Bayraklar",
+"Characters": "Karakter",
+"Characters (no spaces)": "Karakter (bo\u015fluksuz)",
+"{0} characters": "{0} karakter",
+"Error: Form submit field collision.": "Hata: Form g\u00f6nderme alan\u0131 \u00e7at\u0131\u015fmas\u0131.",
+"Error: No form element found.": "Hata: Form eleman\u0131 bulunamad\u0131.",
+"Update": "G\u00fcncelle\u015ftir",
+"Color swatch": "Renk \u00f6rne\u011fi",
+"Turquoise": "Turkuaz",
+"Green": "Ye\u015fil",
+"Blue": "Mavi",
+"Purple": "Mor",
+"Navy Blue": "Lacivert",
+"Dark Turquoise": "Koyu Turkuaz",
+"Dark Green": "Koyu Ye\u015fil",
+"Medium Blue": "Donuk Mavi",
+"Medium Purple": "Orta Mor",
+"Midnight Blue": "Gece Yar\u0131s\u0131 Mavisi",
+"Yellow": "Sar\u0131",
+"Orange": "Turuncu",
+"Red": "K\u0131rm\u0131z\u0131",
+"Light Gray": "A\u00e7\u0131k Gri",
+"Gray": "Gri",
+"Dark Yellow": "Koyu Sar\u0131",
+"Dark Orange": "Koyu Turuncu",
+"Dark Red": "Koyu K\u0131rm\u0131z\u0131",
+"Medium Gray": "Orta Gri",
+"Dark Gray": "Koyu Gri",
+"Light Green": "A\u00e7\u0131k Ye\u015fil",
+"Light Yellow": "A\u00e7\u0131k Sar\u0131",
+"Light Red": "A\u00e7\u0131k K\u0131rm\u0131z\u0131",
+"Light Purple": "A\u00e7\u0131k Mor",
+"Light Blue": "A\u00e7\u0131k Mavi",
+"Dark Purple": "Koyu Mor",
+"Dark Blue": "Lacivert",
+"Black": "Siyah",
+"White": "Beyaz",
+"Switch to or from fullscreen mode": "Tam ekran moduna ge\u00e7 veya \u00e7\u0131k",
+"Open help dialog": "Yard\u0131m penceresini a\u00e7",
+"history": "ge\u00e7mi\u015f",
+"styles": "stiller",
+"formatting": "bi\u00e7imlendirme",
+"alignment": "hizalanma",
+"indentation": "girinti",
+"permanent pen": "kal\u0131c\u0131 kalem",
+"comments": "yorumlar",
+"Format Painter": "Bi\u00e7im Boyac\u0131s\u0131",
+"Insert\/edit iframe": "\u0130frame ekle\/d\u00fczenle",
+"Capitalization": "B\u00fcy\u00fck Harfle Yaz\u0131m",
+"lowercase": "k\u00fc\u00e7\u00fck harf",
+"UPPERCASE": "B\u00dcY\u00dcK HARF",
+"Title Case": "\u0130lk Harfler B\u00fcy\u00fck",
+"Permanent Pen Properties": "Kal\u0131c\u0131 Kalem \u00d6zellikleri",
+"Permanent pen properties...": "Kal\u0131c\u0131 kalem \u00f6zellikleri...",
+"Font": "Yaz\u0131 Tipi",
+"Size": "Boyut",
+"More...": "Devam\u0131...",
+"Spellcheck Language": "Yaz\u0131m Denetimi Dili",
+"Select...": "Se\u00e7...",
+"Preferences": "Tercihler",
+"Yes": "Evet",
+"No": "Hay\u0131r",
+"Keyboard Navigation": "Klavye Tu\u015flar\u0131",
+"Version": "S\u00fcr\u00fcm",
+"Anchor": "\u00c7apa",
+"Special character": "\u00d6zel karakter",
+"Code sample": "Code sample",
+"Color": "Renk",
+"Emoticons": "\u0130fadeler",
+"Document properties": "Dok\u00fcman \u00f6zellikleri",
+"Image": "Resim",
+"Insert link": "Ba\u011flant\u0131 ekle",
+"Target": "Hedef",
+"Link": "Ba\u011flant\u0131",
+"Poster": "Poster",
+"Media": "Medya",
+"Print": "Yazd\u0131r",
+"Prev": "\u00d6nceki",
+"Find and replace": "Bul ve de\u011fi\u015ftir",
+"Whole words": "Tam kelimeler",
+"Spellcheck": "Yaz\u0131m denetimi",
+"Caption": "Ba\u015fl\u0131k",
+"Insert template": "\u015eablon ekle"
+});
\ No newline at end of file
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 6338be0b..fea85990 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -15,6 +15,11 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+function getPath() {
+    var jsFileLocation = $("script[src*=jquery]").attr("src");  // the js file path
+    return jsFileLocation.substr(0, jsFileLocation.search("/static/js/libs/jquery.min.js"));  // the js folder path
+}
 // Generic control/related handler to show/hide fields based on a checkbox' value
 // e.g.
 //  <input type="checkbox" data-control="stuff-to-show">
@@ -33,10 +38,10 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
 $(document).on("change", "select[data-control]", function() {
     var $this = $(this);
     var name = $this.data("control");
-    var showOrHide = parseInt($this.val());
+    var showOrHide = parseInt($this.val(), 10);
     // var showOrHideLast = $("#" + name + " option:last").val()
     for (var i = 0; i < $(this)[0].length; i++) {
-        var element = parseInt($(this)[0][i].value);
+        var element = parseInt($(this)[0][i].value, 10);
         if (element === showOrHide) {
             $("[data-related^=" + name + "][data-related*=-" + element + "]").show();
         } else {
@@ -50,7 +55,7 @@ $(document).on("change", "select[data-control]", function() {
 $(document).on("change", "select[data-controlall]", function() {
     var $this = $(this);
     var name = $this.data("controlall");
-    var showOrHide = parseInt($this.val());
+    var showOrHide = parseInt($this.val(), 10);
     if (showOrHide) {
         $("[data-related=" + name + "]").show();
     } else {
@@ -58,6 +63,136 @@ $(document).on("change", "select[data-controlall]", function() {
     }
 });
 
+// Syntax has to be bind not on, otherwise problems with firefox
+$(".container-fluid").bind("dragenter dragover", function () {
+    if($("#btn-upload").length && !$('body').hasClass('shelforder')) {
+        $(this).css('background', '#e6e6e6');
+    }
+    return false;
+});
+
+// Syntax has to be bind not on, otherwise problems with firefox
+$(".container-fluid").bind("dragleave", function () {
+    if($("#btn-upload").length && !$('body').hasClass('shelforder')) {
+        $(this).css('background', '');
+    }
+    return false;
+});
+
+// Syntax has to be bind not on, otherwise problems with firefox
+$(".container-fluid").bind('drop', function (e) {
+    e.preventDefault()
+    e.stopPropagation();
+    if($("#btn-upload").length) {
+        var files = e.originalEvent.dataTransfer.files;
+        var test = $("#btn-upload")[0].accept;
+        $(this).css('background', '');
+        const dt = new DataTransfer()
+        jQuery.each(files, function (index, item) {
+            if (test.indexOf(item.name.substr(item.name.lastIndexOf('.'))) !== -1) {
+                dt.items.add(item);
+            }
+        });
+        if (dt.files.length) {
+            $("#btn-upload")[0].files = dt.files;
+            $("#form-upload").submit();
+        }
+    }
+});
+
+$("#btn-upload").change(function() {
+    $("#form-upload").submit();
+});
+
+$(document).ready(function() {
+  var inp = $('#query').first()
+  if (inp.length) {
+    var val = inp.val()
+    if (val.length) {
+      inp.val('').blur().focus().val(val)
+    }
+  }
+});
+
+function confirmDialog(id, dataValue, yesFn, noFn) {
+    var $confirm = $("#GeneralDeleteModal");
+    // var dataValue= e.data('value'); // target.data('value');
+    $confirm.modal('show');
+    $.ajax({
+        method:"get",
+        dataType: "json",
+        url: getPath() + "/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
+    var deleteId = $(this).data("delete-id");
+    var bookFormat = $(this).data("delete-format");
+    if (bookFormat) {
+        window.location.href = getPath() + "/delete/" + deleteId + "/" + bookFormat;
+    } else {
+        if ($(this).data("delete-format")) {
+            path = getPath() + "/ajax/delete/" + deleteId;
+            $.ajax({
+                method:"get",
+                url: path,
+                timeout: 900,
+                success:function(data) {
+                    data.forEach(function(item) {
+                        if (!jQuery.isEmptyObject(item)) {
+                            if (item.format != "") {
+                                $("button[data-delete-format='"+item.format+"']").addClass('hidden');
+                            }
+                            $( ".navbar" ).after( '<div class="row-fluid text-center" style="margin-top: -20px;">' +
+                                '<div id="flash_'+item.type+'" class="alert alert-'+item.type+'">'+item.message+'</div>' +
+                                '</div>');
+
+                        }
+                    });
+                }
+            });
+        } else {
+            window.location.href = getPath() + "/delete/" + deleteId;
+
+        }
+    }
+
+});
+
+//triggered when modal is about to be shown
+$("#deleteModal").on("show.bs.modal", function(e) {
+    //get data-id attribute of the clicked element and store in button
+    var bookId = $(e.relatedTarget).data("delete-id");
+    var bookfomat = $(e.relatedTarget).data("delete-format");
+    if (bookfomat) {
+        $("#book_format").removeClass('hidden');
+        $("#book_complete").addClass('hidden');
+    } else {
+        $("#book_complete").removeClass('hidden');
+        $("#book_format").addClass('hidden');
+    }
+    $(e.currentTarget).find("#delete_confirm").data("delete-id", bookId);
+    $(e.currentTarget).find("#delete_confirm").data("delete-format", bookfomat);
+});
+
+
 
 $(function() {
     var updateTimerID;
@@ -106,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",
@@ -118,20 +303,36 @@ $(function() {
         layoutMode : "fitColumns"
     });
 
+    if ($(".load-more").length && $(".next").length) {
+        var $loadMore = $(".load-more .row").infiniteScroll({
+            debug: false,
+            // selector for the paged navigation (it will be hidden)
+            path : ".next",
+            // selector for the NEXT link (to page 2)
+            append : ".load-more .book"
+            //animate      : true, # ToDo: Reenable function
+            //extraScrollPx: 300
+        });
+        $loadMore.on( "append.infiniteScroll", function( event, response, path, data ) {
+            if ($("body").hasClass("blur")) {
+                $(".pagination").addClass("hidden").html(() => $(response).find(".pagination").html());
+            }
+            $(".load-more .row").isotope( "appended", $(data), null );
+        });
 
-    var $loadMore = $(".load-more .row").infiniteScroll({
-        debug: false,
-        // selector for the paged navigation (it will be hidden)
-        path : ".next",
-        // selector for the NEXT link (to page 2)
-        append : ".load-more .book"
-        //animate      : true, # ToDo: Reenable function
-        //extraScrollPx: 300
-    });
-    $loadMore.on( "append.infiniteScroll", function( event, response, path, data ) {
-        $(".pagination").addClass("hidden");
-        $(".load-more .row").isotope( "appended", $(data), null );
-    });
+        // fix for infinite scroll on CaliBlur Theme (#981)
+        if ($("body").hasClass("blur")) {
+            $(".col-sm-10").bind("scroll", function () {
+                if (
+                    $(this).scrollTop() + $(this).innerHeight() >=
+                    $(this)[0].scrollHeight
+                ) {
+                    $loadMore.infiniteScroll("loadNextPage");
+                    window.history.replaceState({}, null, $loadMore.infiniteScroll("getAbsolutePath"));
+                }
+            });
+        }
+    }
 
     $("#restart").click(function() {
         $.ajax({
@@ -279,18 +480,95 @@ $(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) {
+                $.ajax({
+                    method: "get",
+                    url: getPath() + "/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() {
@@ -302,12 +580,10 @@ $(function() {
         $("#DialogFinished").addClass("hidden");
         $("#DialogContent").html("");
         $("#spinner2").show();
-        var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
-        var path = src.substring(0, src.lastIndexOf("/"));
         $.ajax({
             method:"get",
             dataType: "json",
-            url: path + "/../../import_ldap_users",
+            url: getPath() + "/import_ldap_users",
             success: function success(data) {
                 $("#spinner2").hide();
                 $("#DialogContent").html(data.text);
@@ -324,16 +600,19 @@ $(function() {
     });
 
     $(".update-view").click(function(e) {
-        var target = $(this).data("target");
         var view = $(this).data("view");
 
         e.preventDefault();
         e.stopPropagation();
-        var data = {};
-        data[target] = view;
-        console.debug("Updating view data: ", data);
-        $.post( "/ajax/view", data).done(function( ) {
-            location.reload();
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: window.location.pathname + "/../../ajax/view",
+            data: "{\"series\": {\"series_view\": \""+ view +"\"}}",
+            success: function success() {
+                location.reload();
+            }
         });
     });
 });
diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js
index 8b7fb075..edafa82c 100644
--- a/cps/static/js/reading/epub.js
+++ b/cps/static/js/reading/epub.js
@@ -20,6 +20,34 @@ var reader;
         $("#bookmark, #show-Bookmarks").remove();
     }
 
+    // Enable swipe support
+    // I have no idea why swiperRight/swiperLeft from plugins is not working, events just don't get fired
+    var touchStart = 0;
+    var touchEnd = 0;
+
+    reader.rendition.on('touchstart', function(event) {
+        touchStart = event.changedTouches[0].screenX;
+    });
+    reader.rendition.on('touchend', function(event) {
+      touchEnd = event.changedTouches[0].screenX;
+        if (touchStart < touchEnd) {
+            if(reader.book.package.metadata.direction === "rtl") {
+    			reader.rendition.next();
+    		} else {
+    			reader.rendition.prev();
+    		}
+            // Swiped Right
+        }
+        if (touchStart > touchEnd) {
+            if(reader.book.package.metadata.direction === "rtl") {
+    			reader.rendition.prev();
+    		} else {
+                reader.rendition.next();
+    		}
+            // Swiped Left
+        }
+    });
+
     /**
      * @param {string} action - Add or remove bookmark
      * @param {string|int} location - Location or zero
@@ -43,3 +71,5 @@ var reader;
         });
     }
 })();
+
+
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 77045db3..a27b998e 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -1,5 +1,5 @@
 /* This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
- *    Copyright (C) 2018 OzzieIsaacs
+ *    Copyright (C) 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
@@ -15,10 +15,159 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* exported TableActions, RestrictionActions*/
+/* exported TableActions, RestrictionActions, EbookActions, responseHandler */
+/* global getPath, confirmDialog */
+
+var selections = [];
 
 $(function() {
 
+    $("#books-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table",
+        function (e, rowsAfter, rowsBefore) {
+            var rows = rowsAfter;
+
+            if (e.type === "uncheck-all") {
+                rows = rowsBefore;
+            }
+
+            var ids = $.map(!$.isArray(rows) ? [rows] : rows, function (row) {
+                return row.id;
+            });
+
+            var func = $.inArray(e.type, ["check", "check-all"]) > -1 ? "union" : "difference";
+            selections = window._[func](selections, ids);
+            if (selections.length >= 2) {
+                $("#merge_books").removeClass("disabled");
+                $("#merge_books").attr("aria-disabled", false);
+            } else {
+                $("#merge_books").addClass("disabled");
+                $("#merge_books").attr("aria-disabled", true);
+            }
+            if (selections.length < 1) {
+                $("#delete_selection").addClass("disabled");
+                $("#delete_selection").attr("aria-disabled", true);
+            } else {
+                $("#delete_selection").removeClass("disabled");
+                $("#delete_selection").attr("aria-disabled", false);
+            }
+        });
+    $("#delete_selection").click(function() {
+        $("#books-table").bootstrapTable("uncheckAll");
+    });
+
+    $("#merge_confirm").click(function() {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: window.location.pathname + "/../../ajax/mergebooks",
+            data: JSON.stringify({"Merge_books":selections}),
+            success: function success() {
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
+            }
+        });
+    });
+
+    $("#merge_books").click(function() {
+        $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: window.location.pathname + "/../../ajax/simulatemerge",
+            data: JSON.stringify({"Merge_books":selections}),
+            success: function success(booTitles) {
+                $.each(booTitles.from, function(i, item) {
+                    $("<span>- " + item + "</span>").appendTo("#merge_from");
+                });
+                $("#merge_to").text("- " + booTitles.to);
+
+            }
+        });
+    });
+
+    var column = [];
+    $("#books-table > thead > tr > th").each(function() {
+        var element = {};
+        if ($(this).attr("data-edit")) {
+            element = {
+                editable: {
+                    mode: "inline",
+                    emptytext: "<span class='glyphicon glyphicon-plus'></span>",
+                }
+            };
+        }
+        var validateText = $(this).attr("data-edit-validate");
+        if (validateText) {
+            element.editable.validate = function (value) {
+                if ($.trim(value) === "") return validateText;
+            };
+        }
+        column.push(element);
+    });
+
+    $("#books-table").bootstrapTable({
+        sidePagination: "server",
+        pagination: true,
+        paginationLoop: false,
+        paginationDetailHAlign: " hidden",
+        paginationHAlign: "left",
+        idField: "id",
+        uniqueId: "id",
+        search: true,
+        showColumns: true,
+        searchAlign: "left",
+        showSearchButton : false,
+        searchOnEnterKey: true,
+        checkboxHeader: false,
+        maintainMetaData: true,
+        responseHandler: responseHandler,
+        columns: column,
+        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);
+                    }
+                });
+            }
+        },
+        // eslint-disable-next-line no-unused-vars
+        onColumnSwitch: function (field, checked) {
+            var visible = $("#books-table").bootstrapTable("getVisibleColumns");
+            var hidden  = $("#books-table").bootstrapTable("getHiddenColumns");
+            var st = "";
+            visible.forEach(function(item) {
+                st += "\"" + item.field + "\":\"" + "true" + "\",";
+            });
+            hidden.forEach(function(item) {
+                st += "\"" + item.field + "\":\"" + "false" + "\",";
+            });
+            st = st.slice(0, -1);
+            $.ajax({
+                method:"post",
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                url: window.location.pathname + "/../../ajax/table_settings",
+                data: "{" + st + "}",
+            });
+        },
+    });
+
+
     $("#domain_allow_submit").click(function(event) {
         event.preventDefault();
         $("#domain_add_allow").ajaxForm();
@@ -33,6 +182,7 @@ $(function() {
             }
         });
     });
+
     $("#domain-allow-table").bootstrapTable({
         formatNoMatches: function () {
             return "";
@@ -59,15 +209,13 @@ $(function() {
         },
         striped: false
     });
-    $("#btndeletedomain").click(function() {
-        //get data-id attribute of the clicked element
-        var domainId = $(this).data("domainId");
+
+    function domainHandle(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",
@@ -86,12 +234,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, domainHandle);
+        }
     });
-    //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, domainHandle);
+        }
     });
 
     $("#restrictModal").on("hidden.bs.modal", function () {
@@ -104,14 +256,12 @@ $(function() {
         $("#h3").addClass("hidden");
         $("#h4").addClass("hidden");
     });
-    function startTable(type) {
-        var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
-        var path = src.substring(0, src.lastIndexOf("/"));
+    function startTable(type, userId) {
         $("#restrict-elements-table").bootstrapTable({
             formatNoMatches: function () {
                 return "";
             },
-            url: path + "/../../ajax/listrestriction/" + type,
+            url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
             rowStyle: function(row) {
                 // console.log('Reihe :' + row + " Index :" + index);
                 if (row.id.charAt(0) === "a") {
@@ -125,13 +275,13 @@ $(function() {
                     $.ajax ({
                         type: "Post",
                         data: "id=" + row.id + "&type=" + row.type + "&Element=" + encodeURIComponent(row.Element),
-                        url: path + "/../../ajax/deleterestriction/" + type,
+                        url: getPath() + "/ajax/deleterestriction/" + type + "/" + userId,
                         async: true,
                         timeout: 900,
                         success:function() {
                             $.ajax({
                                 method:"get",
-                                url: path + "/../../ajax/listrestriction/" + type,
+                                url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
                                 async: true,
                                 timeout: 900,
                                 success:function(data) {
@@ -147,7 +297,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: getPath() + "/ajax/editrestriction/" + type + "/" + userId,
                 type: "Post",
                 data: row
             });
@@ -155,13 +305,13 @@ $(function() {
         $("[id^=submit_]").click(function() {
             $(this)[0].blur();
             $.ajax({
-                url: path + "/../../ajax/addrestriction/" + type,
+                url: getPath() + "/ajax/addrestriction/" + type + "/" + userId,
                 type: "Post",
                 data: $(this).closest("form").serialize() + "&" + $(this)[0].name + "=",
                 success: function () {
                     $.ajax ({
                         method:"get",
-                        url: path + "/../../ajax/listrestriction/" + type,
+                        url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
                         async: true,
                         timeout: 900,
                         success:function(data) {
@@ -174,21 +324,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");
     });
@@ -198,13 +348,14 @@ $(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>"
     ].join("");
 }
 
+
 /* Function for deleting domain restrictions */
 function RestrictionActions (value, row) {
     return [
@@ -213,3 +364,20 @@ function RestrictionActions (value, row) {
         "</div>"
     ].join("");
 }
+
+/* Function for deleting books */
+function EbookActions (value, row) {
+    return [
+        "<div class=\"book-remove\" data-toggle=\"modal\" data-target=\"#deleteModal\" data-ajax=\"1\" data-delete-id=\"" + row.id + "\" title=\"Remove\">",
+        "<i class=\"glyphicon glyphicon-trash\"></i>",
+        "</div>"
+    ].join("");
+}
+
+/* Function for keeping checked rows */
+function responseHandler(res) {
+    $.each(res.rows, function (i, row) {
+        row.state = $.inArray(row.id, selections) !== -1;
+    });
+    return res;
+}
diff --git a/cps/tasks/__init__.py b/cps/tasks/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
new file mode 100644
index 00000000..d3e74569
--- /dev/null
+++ b/cps/tasks/convert.py
@@ -0,0 +1,229 @@
+from __future__ import division, print_function, unicode_literals
+import sys
+import os
+import re
+
+from glob import glob
+from shutil import copyfile
+
+from sqlalchemy.exc import SQLAlchemyError
+
+from cps.services.worker import CalibreTask
+from cps import db
+from cps import logger, config
+from cps.subproc_wrapper import process_open
+from flask_babel import gettext as _
+
+from cps.tasks.mail import TaskEmail
+from cps import gdriveutils
+log = logger.create()
+
+
+class TaskConvert(CalibreTask):
+    def __init__(self, file_path, bookid, taskMessage, settings, kindle_mail, user=None):
+        super(TaskConvert, self).__init__(taskMessage)
+        self.file_path = file_path
+        self.bookid = bookid
+        self.settings = settings
+        self.kindle_mail = kindle_mail
+        self.user = user
+
+        self.results = dict()
+
+    def run(self, worker_thread):
+        self.worker_thread = worker_thread
+        if config.config_use_google_drive:
+            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:
+                datafile = os.path.join(config.config_calibre_dir,
+                                        cur_book.path,
+                                        data.name + u"." + self.settings['old_book_format'].lower())
+                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()
+        if config.config_use_google_drive:
+            os.remove(self.file_path + u'.' + self.settings['old_book_format'].lower())
+
+        if filename:
+            if config.config_use_google_drive:
+                # Upload files to gdrive
+                gdriveutils.updateGdriveCalibreFromLocal()
+                self._handleSuccess()
+            if self.kindle_mail:
+                # if we're sending to kindle after converting, create a one-off task and run it immediately
+                # todo: figure out how to incorporate this into the progress
+                try:
+                    worker_thread.add(self.user, TaskEmail(self.settings['subject'],
+                                                           self.results["path"],
+                                                           filename,
+                                                           self.settings,
+                                                           self.kindle_mail,
+                                                           self.settings['subject'],
+                                                           self.settings['body'],
+                                                           internal=True)
+                                      )
+                except Exception as e:
+                    return self._handleError(str(e))
+
+    def _convert_ebook_format(self):
+        error_message = None
+        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 - 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) 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 = 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.",
+                     book_id,
+                     format_new_ext)
+
+        if config.config_kepubifypath and format_old_ext == '.epub' and format_new_ext == '.kepub':
+            check, error_message = self._convert_kepubify(file_path,
+                                                          format_old_ext,
+                                                          format_new_ext)
+        else:
+            # check if calibre converter-executable is existing
+            if not os.path.exists(config.config_converterpath):
+                # ToDo Text is not translated
+                self._handleError(_(u"Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
+                return
+            check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext)
+
+        if check == 0:
+            cur_book = local_db.get_book(book_id)
+            if os.path.isfile(file_path + format_new_ext):
+                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_db.session.merge(new_format)
+                    local_db.session.commit()
+                except SQLAlchemyError as e:
+                    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
+                if not config.config_use_google_drive:
+                    self._handleSuccess()
+                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')
+        self._handleError(error_message)
+        return
+
+    def _convert_kepubify(self, file_path, format_old_ext, format_new_ext):
+        quotes = [1, 3]
+        command = [config.config_kepubifypath, (file_path + format_old_ext), '-o', os.path.dirname(file_path)]
+        try:
+            p = process_open(command, quotes)
+        except OSError as e:
+            return 1, _(u"Kepubify-converter failed: %(error)s", error=e)
+        self.progress = 0.01
+        while True:
+            nextline = p.stdout.readlines()
+            nextline = [x.strip('\n') for x in nextline if x != '\n']
+            if sys.version_info < (3, 0):
+                nextline = [x.decode('utf-8') for x in nextline]
+            for line in nextline:
+                log.debug(line)
+            if p.poll() is not None:
+                break
+
+        # ToD Handle
+        # process returncode
+        check = p.returncode
+
+        # move file
+        if check == 0:
+            converted_file = glob(os.path.join(os.path.dirname(file_path), "*.kepub.epub"))
+            if len(converted_file) == 1:
+                copyfile(converted_file[0], (file_path + format_new_ext))
+                os.unlink(converted_file[0])
+            else:
+                return 1, _(u"Converted file not found or more than one file in folder %(folder)s",
+                            folder=os.path.dirname(file_path))
+        return check, None
+
+    def _convert_calibre(self, file_path, format_old_ext, format_new_ext):
+        try:
+            # Linux py2.7 encode as list without quotes no empty element for parameters
+            # linux py3.x no encode and as list without quotes no empty element for parameters
+            # windows py2.7 encode as string with quotes empty element for parameters is okay
+            # windows py 3.x no encode and as string with quotes empty element for parameters is okay
+            # separate handling for windows and linux
+            quotes = [1, 2]
+            command = [config.config_converterpath, (file_path + format_old_ext),
+                       (file_path + format_new_ext)]
+            quotes_index = 3
+            if config.config_calibre:
+                parameters = config.config_calibre.split(" ")
+                for param in parameters:
+                    command.append(param)
+                    quotes.append(quotes_index)
+                    quotes_index += 1
+
+            p = process_open(command, quotes)
+        except OSError as e:
+            return 1, _(u"Ebook-converter failed: %(error)s", error=e)
+
+        while p.poll() is None:
+            nextline = p.stdout.readline()
+            if os.name == 'nt' and sys.version_info < (3, 0):
+                nextline = nextline.decode('windows-1252')
+            elif os.name == 'posix' and sys.version_info < (3, 0):
+                nextline = nextline.decode('utf-8')
+            log.debug(nextline.strip('\r\n'))
+            # parse progress string from calibre-converter
+            progress = re.search(r"(\d+)%\s.*", nextline)
+            if progress:
+                self.progress = int(progress.group(1)) / 100
+                if config.config_use_google_drive:
+                    self.progress *= 0.9
+
+        # process returncode
+        check = p.returncode
+        calibre_traceback = p.stderr.readlines()
+        error_message = ""
+        for ele in calibre_traceback:
+            if sys.version_info < (3, 0):
+                ele = ele.decode('utf-8')
+            log.debug(ele.strip('\n'))
+            if not ele.startswith('Traceback') and not ele.startswith('  File'):
+                error_message = _("Calibre failed with error: %(error)s", error=ele.strip('\n'))
+        return check, error_message
+
+    @property
+    def name(self):
+        return "Convert"
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
new file mode 100644
index 00000000..4f7ed777
--- /dev/null
+++ b/cps/tasks/mail.py
@@ -0,0 +1,241 @@
+from __future__ import division, print_function, unicode_literals
+import sys
+import os
+import smtplib
+import threading
+import socket
+
+try:
+    from StringIO import StringIO
+    from email.MIMEBase import MIMEBase
+    from email.MIMEMultipart import MIMEMultipart
+    from email.MIMEText import MIMEText
+except ImportError:
+    from io import StringIO
+    from email.mime.base import MIMEBase
+    from email.mime.multipart import MIMEMultipart
+    from email.mime.text import MIMEText
+
+from email import encoders
+from email.utils import formatdate, make_msgid
+from email.generator import Generator
+
+from cps.services.worker import CalibreTask
+from cps import logger, config
+
+from cps import gdriveutils
+
+log = logger.create()
+
+CHUNKSIZE = 8192
+
+
+# Class for sending email with ability to get current progress
+class EmailBase:
+
+    transferSize = 0
+    progress = 0
+
+    def data(self, msg):
+        self.transferSize = len(msg)
+        (code, resp) = smtplib.SMTP.data(self, msg)
+        self.progress = 0
+        return (code, resp)
+
+    def send(self, strg):
+        """Send `strg' to the server."""
+        log.debug_no_auth('send: {}'.format(strg[:300]))
+        if hasattr(self, 'sock') and self.sock:
+            try:
+                if self.transferSize:
+                    lock=threading.Lock()
+                    lock.acquire()
+                    self.transferSize = len(strg)
+                    lock.release()
+                    for i in range(0, self.transferSize, CHUNKSIZE):
+                        if isinstance(strg, bytes):
+                            self.sock.send((strg[i:i + CHUNKSIZE]))
+                        else:
+                            self.sock.send((strg[i:i + CHUNKSIZE]).encode('utf-8'))
+                        lock.acquire()
+                        self.progress = i
+                        lock.release()
+                else:
+                    self.sock.sendall(strg.encode('utf-8'))
+            except socket.error:
+                self.close()
+                raise smtplib.SMTPServerDisconnected('Server not connected')
+        else:
+            raise smtplib.SMTPServerDisconnected('please run connect() first')
+
+    @classmethod
+    def _print_debug(cls, *args):
+        log.debug(args)
+
+    def getTransferStatus(self):
+        if self.transferSize:
+            lock2 = threading.Lock()
+            lock2.acquire()
+            value = int((float(self.progress) / float(self.transferSize))*100)
+            lock2.release()
+            return value / 100
+        else:
+            return 1
+
+
+# Class for sending email with ability to get current progress, derived from emailbase class
+class Email(EmailBase, smtplib.SMTP):
+
+    def __init__(self, *args, **kwargs):
+        smtplib.SMTP.__init__(self, *args, **kwargs)
+
+
+# Class for sending ssl encrypted email with ability to get current progress, , derived from emailbase class
+class EmailSSL(EmailBase, smtplib.SMTP_SSL):
+
+    def __init__(self, *args, **kwargs):
+        smtplib.SMTP_SSL.__init__(self, *args, **kwargs)
+
+
+class TaskEmail(CalibreTask):
+    def __init__(self, subject, filepath, attachment, settings, recipient, taskMessage, text, internal=False):
+        super(TaskEmail, self).__init__(taskMessage)
+        self.subject = subject
+        self.attachment = attachment
+        self.settings = settings
+        self.filepath = filepath
+        self.recipent = recipient
+        self.text = text
+        self.asyncSMTP = None
+
+        self.results = dict()
+
+    def run(self, worker_thread):
+        # create MIME message
+        msg = MIMEMultipart()
+        msg['Subject'] = self.subject
+        msg['Message-Id'] = make_msgid('calibre-web')
+        msg['Date'] = formatdate(localtime=True)
+        text = self.text
+        msg.attach(MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8'))
+        if self.attachment:
+            result = self._get_attachment(self.filepath, self.attachment)
+            if result:
+                msg.attach(result)
+            else:
+                self._handleError(u"Attachment not found")
+                return
+
+        msg['From'] = self.settings["mail_from"]
+        msg['To'] = self.recipent
+
+        use_ssl = int(self.settings.get('mail_use_ssl', 0))
+        try:
+            # convert MIME message to string
+            fp = StringIO()
+            gen = Generator(fp, mangle_from_=False)
+            gen.flatten(msg)
+            msg = fp.getvalue()
+
+            # send email
+            timeout = 600  # set timeout to 5mins
+
+            # redirect output to logfile on python2 pn python3 debugoutput is caught with overwritten
+            # _print_debug function
+            if sys.version_info < (3, 0):
+                org_smtpstderr = smtplib.stderr
+                smtplib.stderr = logger.StderrLogger('worker.smtp')
+
+            if use_ssl == 2:
+                self.asyncSMTP = EmailSSL(self.settings["mail_server"], self.settings["mail_port"],
+                                           timeout=timeout)
+            else:
+                self.asyncSMTP = Email(self.settings["mail_server"], self.settings["mail_port"], timeout=timeout)
+
+            # link to logginglevel
+            if logger.is_debug_enabled():
+                self.asyncSMTP.set_debuglevel(1)
+            if use_ssl == 1:
+                self.asyncSMTP.starttls()
+            if self.settings["mail_password"]:
+                self.asyncSMTP.login(str(self.settings["mail_login"]), str(self.settings["mail_password"]))
+            self.asyncSMTP.sendmail(self.settings["mail_from"], self.recipent, msg)
+            self.asyncSMTP.quit()
+            self._handleSuccess()
+
+            if sys.version_info < (3, 0):
+                smtplib.stderr = org_smtpstderr
+
+        except (MemoryError) as e:
+            log.debug_or_exception(e)
+            self._handleError(u'MemoryError sending email: ' + str(e))
+            # return None
+        except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
+            if hasattr(e, "smtp_error"):
+                text = e.smtp_error.decode('utf-8').replace("\n", '. ')
+            elif hasattr(e, "message"):
+                text = e.message
+            elif hasattr(e, "args"):
+                text = '\n'.join(e.args)
+            else:
+                log.debug_or_exception(e)
+                text = ''
+            self._handleError(u'Smtplib Error sending email: ' + text)
+            # return None
+        except (socket.error) as e:
+            self._handleError(u'Socket Error sending email: ' + e.strerror)
+            # return None
+
+
+    @property
+    def progress(self):
+        if self.asyncSMTP is not None:
+            return self.asyncSMTP.getTransferStatus()
+        else:
+            return self._progress
+
+    @progress.setter
+    def progress(self, x):
+        """This gets explicitly set when handle(Success|Error) are called. In this case, remove the SMTP connection"""
+        if x == 1:
+            self.asyncSMTP = None
+            self._progress = x
+
+
+    @classmethod
+    def _get_attachment(cls, bookpath, filename):
+        """Get file as MIMEBase message"""
+        calibrepath = config.config_calibre_dir
+        if config.config_use_google_drive:
+            df = gdriveutils.getFileFromEbooksFolder(bookpath, filename)
+            if df:
+                datafile = os.path.join(calibrepath, bookpath, filename)
+                if not os.path.exists(os.path.join(calibrepath, bookpath)):
+                    os.makedirs(os.path.join(calibrepath, bookpath))
+                df.GetContentFile(datafile)
+            else:
+                return None
+            file_ = open(datafile, 'rb')
+            data = file_.read()
+            file_.close()
+            os.remove(datafile)
+        else:
+            try:
+                file_ = open(os.path.join(calibrepath, bookpath, filename), 'rb')
+                data = file_.read()
+                file_.close()
+            except IOError as e:
+                log.debug_or_exception(e)
+                log.error(u'The requested file could not be read. Maybe wrong permissions?')
+                return None
+
+        attachment = MIMEBase('application', 'octet-stream')
+        attachment.set_payload(data)
+        encoders.encode_base64(attachment)
+        attachment.add_header('Content-Disposition', 'attachment',
+                              filename=filename)
+        return attachment
+
+    @property
+    def name(self):
+        return "Email"
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
new file mode 100644
index 00000000..d7ef34c2
--- /dev/null
+++ b/cps/tasks/upload.py
@@ -0,0 +1,18 @@
+from __future__ import division, print_function, unicode_literals
+
+from datetime import datetime
+from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
+
+class TaskUpload(CalibreTask):
+    def __init__(self, taskMessage):
+        super(TaskUpload, self).__init__(taskMessage)
+        self.start_time = self.end_time = datetime.now()
+        self.stat = STAT_FINISH_SUCCESS
+        self.progress = 1
+
+    def run(self, worker_thread):
+        """Upload task doesn't have anything to do, it's simply a way to add information to the task list"""
+
+    @property
+    def name(self):
+        return "Upload"
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index d8cf88db..fb0c758f 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -44,7 +44,6 @@
         <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a></div>
       {% if (config.config_login_type == 1) %}
         <div class="btn btn-default" id="import_ldap_users" data-toggle="modal" data-target="#StatusDialog">{{_('Import LDAP Users')}}</div>
-        <!--a href="#" id="import_ldap_users" name="import_ldap_users"><button type="submit" class="btn btn-default">{{_('Import LDAP Users')}}</button></a-->
       {% endif %}
     </div>
   </div>
@@ -52,23 +51,31 @@
   <div class="row">
     <div class="col">
       <h2>{{_('E-mail Server Settings')}}</h2>
-      <table class="table table-striped" id="table_email">
-        <tr>
-          <th>{{_('SMTP Hostname')}}</th>
-          <th>{{_('SMTP Port')}}</th>
-          <th>{{_('Encryption')}}</th>
-          <th>{{_('SMTP Login')}}</th>
-          <th class="hidden-xs">{{_('From E-mail')}}</th>
-        </tr>
-        <tr>
-          <td>{{email.mail_server}}</td>
-          <td>{{email.mail_port}}</td>
-          <td>{% if email.mail_use_ssl %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-          <td>{{email.mail_login}}</td>
-          <td class="hidden-xs">{{email.mail_from}}</td>
-        </tr>
-      </table>
-      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit E-mail Server Settings')}}</a></div>
+      {% if config.get_mail_server_configured() %}
+      <div class="col-xs-12 col-sm-12">
+        <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('SMTP Hostname')}}</div>
+            <div class="col-xs-6 col-sm-3">{{email.mail_server}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('SMTP Port')}}</div>
+            <div class="col-xs-6 col-sm-3">{{email.mail_port}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Encryption')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(email.mail_use_ssl) }}</div>
+        </div>
+        <div class="row">
+          <div class="col-xs-6 col-sm-3">{{_('SMTP Login')}}</div>
+          <div class="col-xs-6 col-sm-3">{{email.mail_login}}</div>
+        </div>
+        <div class="row">
+          <div class="col-xs-6 col-sm-3">{{_('From E-mail')}}</div>
+          <div class="col-xs-6 col-sm-3">{{email.mail_from}}</div>
+        </div>
+      </div>
+      {% endif %}
+      <div class="btn btn-default emailconfig" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit E-mail Server Settings')}}</a></div>
     </div>
   </div>
 
@@ -88,7 +95,7 @@
             <div class="col-xs-6 col-sm-6">{{_('Port')}}</div>
             <div class="col-xs-6 col-sm-6">{{config.config_port}}</div>
         </div>
-        {% if feature_support['kobo'] and config.config_port != config.config_external_port %}
+        {% if kobo_support and config.config_port != config.config_external_port %}
         <div class="row">
           <div class="col-xs-6 col-sm-6">{{_('External Port')}}</div>
           <div class="col-xs-6 col-sm-6">{{config.config_external_port}}</div>
@@ -132,14 +139,15 @@
     </div>
   </div>
 
-  <div class="row">
-    <div class="col">
-      <h2>{{_('Administration')}}</h2>
+    <div class="row form-group">
+    <h2>{{_('Administration')}}</h2>
+      <div class="btn btn-default"><a id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a></div>
       <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
+    </div>
+    <div class="row form-group">
       <div class="btn btn-default" id="restart_database" data-toggle="modal" data-target="#StatusDialog">{{_('Reconnect Calibre Database')}}</div>
       <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
       <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
-    </div>
   </div>
 
   <div class="row">
@@ -160,9 +168,11 @@
         </tbody>
       </table>
 
+      {%  if feature_support['updater'] %}
       <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
-      <div class="btn btn-default" id="check_for_update">{{_('Check for Update')}}</div>
-      <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#StatusDialog">{{_('Perform Update')}}</div>
+      <div class="btn btn-primary" id="check_for_update">{{_('Check for Update')}}</div>
+      <div class="btn btn-primary hidden" id="perform_update" data-toggle="modal" data-target="#StatusDialog">{{_('Perform Update')}}</div>
+      {%  endif %}
     </div>
   </div>
 </div>
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 18742003..4e32db80 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -23,24 +23,23 @@
     <h3>{{_("In Library")}}</h3>
   {% endif %}
     <div class="filterheader hidden-xs hidden-sm">
-      <a id="new" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort='new')}}"><span class="glyphicon glyphicon-book"></span> <span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
-      <a id="old" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort='old')}}"><span class="glyphicon glyphicon-book"></span> <span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
-      <a id="asc" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort='abc')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
-      <a id="desc" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort='zyx')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
-      <a id="pub_new" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort='pubnew')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
-      <a id="pub_old" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
-      <!--div class="btn-group character" role="group">
-        <a id="no_shelf" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort='pubold')}}"><span class="glyphicon glyphicon-list"></span><b>?</b></a>
-        <div id="all" class="btn btn-primary">{{_('All')}}</div>
-      </div-->
+      <a id="new" data-toggle="tooltip" title="{{_('Sort according to book date, newest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=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 id="old" data-toggle="tooltip" title="{{_('Sort according to book date, oldest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=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 id="asc" data-toggle="tooltip" title="{{_('Sort title in alphabetical order')}}" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort_param='abc')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
+      <a id="desc" data-toggle="tooltip" title="{{_('Sort title in reverse alphabetical order')}}" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort_param='zyx')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
+      <a id="pub_new" data-toggle="tooltip" title="{{_('Sort according to publishing date, newest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort_param='pubnew')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
+      <a id="pub_old" data-toggle="tooltip" title="{{_('Sort according to publishing date, oldest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data='author', book_id=id, sort_param='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
     </div>
-  <div class="row">
+  <div class="row display-flex">
     {% if entries[0] %}
     {% for entry in entries %}
     <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">
@@ -53,7 +52,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -61,15 +60,23 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.data %}
-            {% if format.format|lower == 'mp3' %}
+            {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
@@ -114,6 +121,14 @@
 		    {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         <div class="rating">
           {% for number in range((entry.average_rating)|float|round|int(2)) %}
           <span class="glyphicon glyphicon-star good"></span>
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 5c081101..c0fc141e 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -3,17 +3,17 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        <img src="{{ url_for('web.get_cover', book_id=book.id) }}" alt="{{ book.title }}"/>
+        <img src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
-      <button type="button" class="btn btn-danger" id="delete" data-toggle="modal" data-target="#deleteModal">{{_("Delete Book")}}</button>
+      <button type="button" class="btn btn-danger" id="delete" data-toggle="modal" data-delete-id="{{ book.id }}" data-target="#deleteModal">{{_("Delete Book")}}</button>
     </div>
     {% if book.data|length > 1 %}
       <div class="text-center more-stuff"><h4>{{_('Delete formats:')}}</h4>
       {% for file in book.data %}
         <div class="form-group">
-          <a href="{{ url_for('editbook.delete_book', book_id=book.id, book_format=file.format) }}" class="btn btn-danger" type="button">{{_('Delete')}} - {{file.format}}</a>
+          <button type="button" class="btn btn-danger" id="delete_format" data-toggle="modal" data-delete-id="{{ book.id }}" data-delete-format="{{ file.format }}" data-target="#deleteModal">{{_('Delete')}} - {{file.format}}</button>
         </div>
       {% endfor %}
       </div>
@@ -92,15 +92,19 @@
       <label for="rating">{{_('Rating')}}</label>
       <input type="number"  name="rating" id="rating" class="rating input-lg" data-clearable="" value="{% if book.ratings %}{{(book.ratings[0].rating / 2)|int}}{% endif %}">
     </div>
+    {% if g.user.role_upload() or g.user.role_admin()%}
+      {% if g.allow_upload %}
     <div class="form-group">
       <label for="cover_url">{{_('Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)')}}</label>
       <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
     </div>
-    <div class="form-group" aria-label="Upload cover from local drive">
+      <div class="form-group" aria-label="Upload cover from local drive">
         <label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from Local Disk') }}</label>
         <div class="upload-cover-input-text" id="upload-cover"></div>
         <input id="btn-upload-cover" name="btn-upload-cover" type="file" accept=".jpg, .jpeg, .png, .webp">
-    </div>
+      </div>
+      {% endif %}
+    {% endif %}
     <div class="form-group">
       <label for="pubdate">{{_('Published Date')}}</label>
       <div style="position: relative">
@@ -193,34 +197,8 @@
 {% endblock %}
 
 {% block modal %}
-{% if g.user.role_delete_books() %}
-<div class="modal fade" id="deleteModal" role="dialog" aria-labelledby="metaDeleteLabel">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header bg-danger text-center">
-          <span>{{_('Are you really sure?')}}</span>
-      </div>
-        <div class="modal-body text-center">
-          <p>
-          <span>{{_('This book will be permanently erased from database')}}</span>
-          <span>{{_('and hard disk')}}</span>
-		  </p>
-          {% if config.config_kobo_sync %}
-          <p>
-            <span>{{_('Important Kobo Note: deleted books will remain on any paired Kobo device.')}}</span>
-            <span>{{_('Books must first be archived and the device synced before a book can safely be deleted.')}}</span>
-          </p>
-          {% endif %}
-        </div>
-
-      <div class="modal-footer">
-        <a href="{{ url_for('editbook.delete_book', book_id=book.id) }}" id="delete_confirm" class="btn btn-danger">{{_('Delete')}}</a>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
-      </div>
-    </div>
-  </div>
-</div>
-{% endif %}
+{{ 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 c8149f03..ecd840b5 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -1,59 +1,99 @@
 {% extends "layout.html" %}
+{% macro text_table_row(parameter, edit_text, show_text, validate) -%}
+<th data-field="{{ parameter }}" id="{{ parameter }}" data-sortable="true"
+    data-visible = "{{visiblility.get(parameter)}}"
+    {% if g.user.role_edit() %}
+        data-editable-type="text"
+        data-editable-url="{{ url_for('editbook.edit_list_book', param=parameter)}}"
+        data-editable-title="{{ edit_text }}"
+        data-edit="true"
+        {% if validate %}data-edit-validate="{{ _('This Field is Required') }}" {% endif %}
+    {% endif %}
+>{{ show_text }}</th>
+{%- endmacro %}
+
+{% block header %}
+<link href="{{ url_for('static', filename='css/libs/bootstrap-table.min.css') }}" rel="stylesheet">
+<link href="{{ url_for('static', filename='css/libs/bootstrap-editable.css') }}" rel="stylesheet">
+{% endblock %}
 {% block body %}
-<h1 class="{{page}}">{{_(title)}}</h1>
-
-    <div class="filterheader hidden-xs hidden-sm">
-      {% if entries.__len__() %}
-       {% if data == 'author' %}
-        <button id="sort_name" class="btn btn-primary"><b>B,A <-> A B</b></button>
-       {% endif %}
-      {% endif %}
-      <button id="desc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
-      <button id="asc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
-      {% if charlist|length %}
-      <button id="all" class="btn btn-primary">{{_('All')}}</button>
-      {% endif %}
-      <div class="btn-group character" role="group">
-        {% for char in charlist%}
-        <button class="btn btn-primary char">{{char.char}}</button>
-        {% endfor %}
-      </div>
-
-      {% if title == "Series" %}
-      <button class="update-view btn btn-primary" href="#" data-target="series_view" data-view="grid">Grid</button>
-      {% endif %}
-    </div>
-  <div class="container">
-    <div id="list" class="col-xs-12 col-sm-6">
-    {% for entry in entries %}
-      {% if loop.index0 == (loop.length/2+loop.length%2)|int and loop.length > 20 %}
+<h2 class="{{page}}">{{_(title)}}</h2>
+      <div class="col-xs-12 col-sm-6">
+        <div class="row">
+          <div class="btn btn-default disabled" id="merge_books" data-toggle="modal" data-target="#mergeModal" aria-disabled="true">{{_('Merge selected books')}}</div>
+          <div class="btn btn-default disabled" id="delete_selection" aria-disabled="true">{{_('Remove Selections')}}</div>
         </div>
-        <div id="second" class="col-xs-12 col-sm-6">
-      {% endif %}
-      <div class="row" {% if entry[0].sort %}data-name="{{entry[0].name}}"{% endif %} data-id="{% if entry[0].sort %}{{entry[0].sort}}{% else %}{% if entry.name %}{{entry.name}}{% else %}{{entry[0].name}}{% endif %}{% endif %}">
-        <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{entry.count}}</span></div>
-        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{% if entry.format %}{{url_for('web.books_list', data=data, sort='new', book_id=entry.format )}}{% else %}{{url_for('web.books_list', data=data, sort='new', book_id=entry[0].id )}}{% endif %}">
-          {% if entry.name %}
-          <div class="rating">
-          {% for number in range(entry.name) %}
-            <span class="glyphicon glyphicon-star good"></span>
-            {% if loop.last and loop.index < 5 %}
-              {% for numer in range(5 - loop.index) %}
-                <span class="glyphicon glyphicon-star"></span>
-              {% endfor %}
-            {% endif %}
-          {% endfor %}
-          </div>
-          {% else %}
-          {% if entry.format %}
-            {{entry.format}}
-          {% else %}
-            {{entry[0].name}}{% endif %}{% endif %}</a></div>
       </div>
-    {% endfor %}
+     <div class="col-xs-12 col-sm-6">
+      <div class="row">
+        <input type="checkbox" id="autoupdate_titlesort" name="autoupdate_titlesort" checked>
+        <label for="autoupdate_titlesort">{{_('Update Title Sort automatically')}}</label>
+      </div>
+      <div class="row">
+        <input type="checkbox" id="autoupdate_autorsort" name="autoupdate_autorsort" checked>
+        <label for="autoupdate_autorsort">{{_('Update Author Sort automatically')}}</label>
+      </div>
+    </div>
+
+    <table id="books-table" class="table table-no-bordered table-striped"
+           data-url="{{url_for('web.list_books')}}">
+      <thead>
+        <tr>
+          {% if g.user.role_edit() %}
+            <th data-field="state" data-checkbox="true" data-sortable="true"></th>
+          {% endif %}
+            <th data-field="id" id="id" data-visible="false" data-switchable="false"></th>
+            {{ text_table_row('title', _('Enter Title'),_('Title'), true) }}
+            {{ text_table_row('sort', _('Enter Title Sort'),_('Title Sort'), false) }}
+            {{ text_table_row('author_sort', _('Enter Author Sort'),_('Author Sort'), false) }}
+            {{ text_table_row('authors', _('Enter Authors'),_('Authors'), true) }}
+            {{ text_table_row('tags', _('Enter Categories'),_('Categories'), false) }}
+            {{ text_table_row('series', _('Enter Series'),_('Series'), false) }}
+            <th data-field="series_index" id="series_index" data-visible="{{visiblility.get('series_index')}}" data-edit-validate="{{ _('This Field is Required') }}" data-sortable="true" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-min="0" data-editable-url="{{ url_for('editbook.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter title')}}"{% endif %}>{{_('Series Index')}}</th>
+            {{ text_table_row('languages', _('Enter Languages'),_('Languages'), false) }}
+            <!--th data-field="pubdate" data-type="date" data-visible="{{visiblility.get('pubdate')}}" data-viewformat="dd.mm.yyyy" id="pubdate" data-sortable="true">{{_('Publishing Date')}}</th-->
+            {{ text_table_row('publishers', _('Enter Publishers'),_('Publishers'), false) }}
+          {% if g.user.role_edit() %}
+            <th data-align="right" data-formatter="EbookActions" data-switchable="false">{{_('Delete')}}</th>
+          {% endif %}
+        </tr>
+      </thead>
+    </table>
+{% endblock %}
+{% block modal %}
+{{ delete_book() }}
+{% if g.user.role_edit() %}
+<div class="modal fade" id="mergeModal" role="dialog" aria-labelledby="metaMergeLabel">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-danger text-center">
+          <span>{{_('Are you really sure?')}}</span>
+      </div>
+        <div class="modal-body">
+          <p></p>
+            <div class="text-left">{{_('Books with Title will be merged from:')}}</div>
+          <p></p>
+            <div class=text-left" id="merge_from"></div>
+          <p></p>
+            <div class="text-left">{{_('Into Book with Title:')}}</div>
+          <p></p>
+            <div class=text-left" id="merge_to"></div>
+        </div>
+      <div class="modal-footer">
+        <input type="button" class="btn btn-danger" value="{{_('Merge')}}" name="merge_confirm" id="merge_confirm" data-dismiss="modal">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
     </div>
   </div>
+</div>
+{% endif %}
+
 {% endblock %}
 {% block js %}
-<script src="{{ url_for('static', filename='js/filter_list.js') }}"></script>
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/table.js') }}"></script>
+<script>
+</script>
 {% endblock %}
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index 132db5cf..716ed7ba 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -15,13 +15,20 @@
     </div>
     <div id="collapseOne" class="panel-collapse collapse in">
       <div class="panel-body">
-       <div class="form-group required input-group">
-        <label for="config_calibre_dir" class="sr-only">{{_('Location of Calibre Database')}}</label>
+       <label for="config_calibre_dir">{{_('Location of Calibre Database')}}</label>
+       <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 option')}}</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 %} >
@@ -60,10 +67,10 @@
             <label for="config_google_drive_watch_changes_response">{{_('Metadata Watch Channel ID')}}</label>
             <div class="form-group input-group required">
               <input type="text" class="form-control" name="config_google_drive_watch_changes_response" id="config_google_drive_watch_changes_response" value="{{ config.config_google_drive_watch_changes_response['id'] }} expires on {{ config.config_google_drive_watch_changes_response['expiration'] |  strftime }}" autocomplete="off" disabled="">
-              <span class="input-group-btn"><a href="{{ url_for('gdrive.revoke_watch_gdrive') }}" class="btn btn-primary">{{_('Revoke')}}</a></span>
+              <span class="input-group-btn"><a href="{{ url_for('gdrive.revoke_watch_gdrive') }}" id="watch_revoke" class="btn btn-primary">{{_('Revoke')}}</a></span>
             </div>
           {% else %}
-            <a href="{{ url_for('gdrive.watch_gdrive') }}" class="btn btn-primary">Enable watch of metadata.db</a>
+            <a href="{{ url_for('gdrive.watch_gdrive') }}" id="enable_gdrive_watch" class="btn btn-primary">Enable watch of metadata.db</a>
           {% endif %}
           {% endif %}
           {% 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">
@@ -264,9 +271,26 @@
             </select>
         </div>
         <div data-related="ldap-cert-settings">
-          <div class="form-group">
-            <label for="config_ldap_cert_path">{{_('LDAP Certificate Path')}}</label>
+          <label for="config_ldap_cacert_path" >{{_('LDAP CACertificate Path (Only needed for Client Certificate Authentication)')}}</label>
+          <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" 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" 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" 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>
         <div class="form-group">
@@ -314,6 +338,20 @@
             <label for="config_ldap_group_members_field">{{_('LDAP Group Members Field')}}</label>
             <input type="text" class="form-control" id="config_ldap_group_members_field" name="config_ldap_group_members_field" value="{% if config.config_ldap_group_members_field != None %}{{ config.config_ldap_group_members_field }}{% endif %}" autocomplete="off">
           </div>
+          <div class="form-group">
+            <label for="ldap_import_user_filter">{{_('LDAP Member User Filter Detection')}}</label>
+              <select name="ldap_import_user_filter" id="ldap_import_user_filter" class="form-control" data-control="ldap_member_user_object">
+                  <option value="0" {% if config.config_ldap_member_user_object == "" %}selected{% endif %}>{{ _('Autodetect') }}</option>
+                  <option value="1" {% if config.config_ldap_member_user_object %}selected{% endif %}>{{ _('Custom Filter') }}</option>
+              </select>
+          </div>
+        <div data-related="ldap_member_user_object-1">
+          <div class="form-group">
+              <label for="config_ldap_member_user_object">{{_('LDAP Member User Filter')}}</label>
+              <input type="text" class="form-control" id="config_ldap_member_user_object" name="config_ldap_member_user_object" value="{% if config.config_ldap_member_user_object != None %}{{ config.config_ldap_member_user_object }}{% endif %}" autocomplete="off">
+          </div>
+        </div>
+
       </div>
       {% endif %}
       {% if feature_support['oauth'] %}
@@ -353,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">
@@ -364,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'] %}
@@ -372,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 %}
@@ -381,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>
@@ -397,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/detail.html b/cps/templates/detail.html
index 25dbb6fd..06686a9c 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,13 +4,13 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+          <img src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
       <div class="btn-toolbar" role="toolbar">
         <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 %}
@@ -81,7 +81,7 @@
 
               {% for format in entry.data %}
                   {% if format.format|lower in audioentries %}
-                    <li><a target="_blank" href="{{ url_for('web.read_book', book_id=entry.id, book_format=format.format|lower) }}">{{format.format}}</a></li>
+                    <li><a target="_blank" href="{{ url_for('web.read_book', book_id=entry.id, book_format=format.format|lower) }}">{{format.format|lower }}</a></li>
                     {% endif %}
               {% endfor %}
                   </ul>
@@ -89,10 +89,10 @@
             {% endif %}
         </div>
       </div>
-      <h2 id="title">{{entry.title|shortentitle(40)}}</h2>
+      <h2 id="title">{{entry.title}}</h2>
       <p class="author">
           {% for author in entry.authors %}
-            <a href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
+            <a href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
@@ -114,7 +114,7 @@
       {% endif %}
 
       {% if entry.series|length > 0 %}
-        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('web.books_list', data='series',sort='abc', book_id=entry.series[0].id)}}">{{entry.series[0].name}}</a></p>
+        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('web.books_list', data='series', sort_param='abc', book_id=entry.series[0].id)}}">{{entry.series[0].name}}</a></p>
       {% endif %}
 
       {% if entry.languages.__len__() > 0 %}
@@ -143,7 +143,7 @@
         <span class="glyphicon glyphicon-tags"></span>
 
         {% for tag in entry.tags %}
-          <a href="{{ url_for('web.books_list', data='category', sort='new', book_id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
+          <a href="{{ url_for('web.books_list', data='category', sort_param='new', book_id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
         {%endfor%}
       </p>
 
@@ -154,13 +154,13 @@
       <div class="publishers">
         <p>
           <span>{{_('Publisher')}}:
-              <a href="{{url_for('web.books_list', data='publisher', sort='new', book_id=entry.publishers[0].id ) }}">{{entry.publishers[0].name}}</a>
+              <a href="{{url_for('web.books_list', data='publisher', sort_param='new', book_id=entry.publishers[0].id ) }}">{{entry.publishers[0].name}}</a>
           </span>
         </p>
       </div>
       {% endif %}
 
-      {% if entry.pubdate[:10] != '0101-01-01' %}
+      {% if (entry.pubdate|string)[:10] != '0101-01-01' %}
       <div class="publishing-date">
         <p>{{_('Published')}}: {{entry.pubdate|formatdate}} </p>
       </div>
@@ -278,10 +278,10 @@
       {% endif %}
 
       {% endif %}
-      {% if g.user.role_edit() %}
+      {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
-          <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
+          <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-primary" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
         </div>
       </div>
       {% endif %}
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 1326f9a9..d57994b4 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -2,13 +2,16 @@
 {% block body %}
 <div class="discover load-more">
   <h2>{{title}}</h2>
-  <div class="row">
+  <div class="row display-flex">
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <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>
@@ -22,7 +25,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -30,10 +33,18 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index bce3bc21..9df0a385 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -37,7 +37,7 @@
     </div>
     <label for="mail_size">{{_('Attachment Size Limit')}}</label>
      <div class="form-group input-group">
-      <input type="number" min="1" max="600" step="1" class="form-control" name="mail_size" id="mail_size" value="{% if content.mail_size != None %}{{ (content.mail_size / 1024 / 1024)|int }}{% endif %}">
+      <input type="number" min="1" max="600" step="1" class="form-control" name="mail_size" id="mail_size" value="{% if content.mail_size != None %}{{ (content.mail_size / 1024 / 1024)|int }}{% endif %}" required>
       <span class="input-group-btn">
         <button type="button" id="attachement_size" class="btn btn-default" disabled>MB</button>
       </span>
@@ -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 8fb084fd..9724e31d 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -8,8 +8,8 @@
         <button id="sort_name" class="btn btn-primary"><b>B,A <-> A B</b></button>
        {% endif %}
       {% endif %}
-      <button id="desc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
-      <button id="asc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
+      <button id="desc" data-id="series" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
+      <button id="asc" data-id="series" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
       {% if charlist|length %}
       <button id="all" class="btn btn-primary">{{_('All')}}</button>
       {% endif %}
@@ -19,21 +19,23 @@
         {% endfor %}
       </div>
 
-        <button class="update-view btn btn-primary" href="#" data-target="series_view" data-view="list">List</button>
+        <button class="update-view btn btn-primary" href="#" data-target="series_view" id='list-button' data-view="list">List</button>
     </div>
 
     {% if entries[0] %}
-        <div id="list" class="row">
+        <div id="list" class="row display-flex">
           {% for entry in entries %}
               <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='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>
+                      <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
+                          <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">
-                      <a href="{{url_for('web.books_list', data=data, sort='new', book_id=entry[0].series[0].id )}}">
+                      <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
                           <p class="title">{{entry[0].series[0].name|shortentitle}}</p>
                       </a>
                   </div>
diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 574bac72..042ed1c5 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -13,7 +13,7 @@
     <link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
     {% if g.current_theme == 1 %}
-       <link href="{{ url_for('static', filename='css/caliBlur.min.css') }}" rel="stylesheet" media="screen">
+       <link href="{{ url_for('static', filename='css/caliBlur.css') }}" rel="stylesheet" media="screen">
     {% endif %}
   </head>
   <body>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 3498791c..d300fc65 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -3,12 +3,15 @@
 {% if g.user.show_detail_random() %}
 <div class="discover random-books">
   <h2 class="random-books">{{_('Discover (Random Books)')}}</h2>
-  <div class="row">
+  <div class="row display-flex">
    {% for entry in random %}
     <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">
@@ -21,7 +24,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -29,10 +32,18 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
@@ -54,24 +65,30 @@
 <div class="discover load-more">
   <h2 class="{{title}}">{{_(title)}}</h2>
     <div class="filterheader hidden-xs hidden-sm">
-      <a data-toggle="tooltip" id="new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort='new')}}"><span class="glyphicon glyphicon-book"></span> <span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
-      <a id="old" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort='old')}}"><span class="glyphicon glyphicon-book"></span> <span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
-      <a id="asc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort='abc')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
-      <a id="desc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort='zyx')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
-      <a id="pub_new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort='pubnew')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
-      <a id="pub_old" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
-      <!--div class="btn-group character">
-        <a id="no_shelf" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort='pubold')}}"><span class="glyphicon glyphicon-list"></span> <b>{{_('Group by series')}}</b></a>
-      </div-->
+      <a data-toggle="tooltip" title="{{_('Sort according to book date, newest first')}}" id="new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=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" href="{{url_for('web.books_list', data=page, book_id=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" href="{{url_for('web.books_list', data=page, book_id=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" href="{{url_for('web.books_list', data=page, book_id=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" href="{{url_for('web.books_list', data=page, book_id=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" href="{{url_for('web.books_list', data=page, book_id=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" href="{{url_for('web.books_list', data=page, book_id=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" href="{{url_for('web.books_list', data=page, book_id=id, sort_param='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+      {% if page == 'series' %}
+      <a data-toggle="tooltip" title="{{_('Sort ascending according to series index')}}" id="series_asc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort_param='seriesasc')}}"><span class="glyphicon glyphicon-sort-by-order"></span></a>
+      <a data-toggle="tooltip" title="{{_('Sort descending according to series index')}}" id="series_desc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, book_id=id, sort_param='seriesdesc')}}"><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+      {% endif %}
     </div>
 
-  <div class="row">
+  <div class="row display-flex">
     {% if entries[0] %}
     {% for entry in entries %}
     <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">
@@ -84,7 +101,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list', data='author', book_id=author.id, sort='new') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='new') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -92,15 +109,23 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list', data='author', book_id=author.id, sort='new') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='new') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.data %}
-            {% if format.format|lower == 'mp3' %}
+            {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {%endfor%}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
diff --git a/cps/templates/languages.html b/cps/templates/languages.html
index 3c30e4d0..2b482e19 100644
--- a/cps/templates/languages.html
+++ b/cps/templates/languages.html
@@ -10,7 +10,7 @@
     {% endif %}
     <div class="row">
         <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{lang_counter[loop.index0].bookcount}}</span></div>
-        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{{url_for('web.books_list', book_id=lang.lang_code, data=data, sort='new')}}">{{lang.name}}</a></div>
+        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{{url_for('web.books_list', book_id=lang.lang_code, data=data, sort_param='new')}}">{{lang.name}}</a></div>
     </div>
   {% endfor %}
   </div>
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 66fffda4..643459cd 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,4 +1,4 @@
-{% from 'modal_restriction.html' import restrict_modal %}
+{% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
@@ -16,7 +16,7 @@
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/upload.css') }}" rel="stylesheet" media="screen">
     {% if g.current_theme == 1 %}
-       <link href="{{ url_for('static', filename='css/caliBlur.min.css') }}" rel="stylesheet" media="screen">
+       <link href="{{ url_for('static', filename='css/caliBlur.css') }}" rel="stylesheet" media="screen">
        <link href="{{ url_for('static', filename='css/caliBlur_override.css') }}" rel="stylesheet" media="screen">
     {% endif %}
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -64,7 +64,7 @@
                     <form id="form-upload" class="navbar-form" action="{{ url_for('editbook.upload') }}" method="post" enctype="multipart/form-data">
                       <div class="form-group">
                         <span class="btn btn-default btn-file">{{_('Upload')}}<input id="btn-upload" name="btn-upload"
-                        type="file" accept="{% for format in accept %}.{{format}}{{ ',' if not loop.last }}{% endfor %}" multiple></span>
+                        type="file" accept="{% for format in accept %}.{% if format != ''%}{{format}}{% else %}*{% endif %}{{ ',' if not loop.last }}{% endfor %}" multiple></span>
                       </div>
                     </form>
                   </li>
@@ -128,7 +128,7 @@
               <li class="nav-head hidden-xs">{{_('Browse')}}</li>
               {% for element in sidebar %}
                 {% if g.user.check_visibility(element['visibility']) and element['public'] %}
-                    <li id="nav_{{element['id']}}" {% if page == element['page'] %}class="active"{% endif %}><a href="{{url_for(element['link'], data=element['page'], sort='new')}}"><span class="glyphicon {{element['glyph']}}"></span>{{_(element['text'])}}</a></li>
+                    <li id="nav_{{element['id']}}" {% if page == element['page'] %}class="active"{% endif %}><a href="{{url_for(element['link'], data=element['page'], sort_param='stored')}}"><span class="glyphicon {{element['glyph']}}"></span>{{_(element['text'])}}</a></li>
                 {% endif %}
               {% endfor %}
               {% if g.user.is_authenticated or g.allow_anonymous %}
@@ -136,10 +136,6 @@
                 {% for shelf in g.shelves_access %}
                   <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list shelf"></span>{{shelf.name|shortentitle(40)}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
                 {% endfor %}
-                <!--li class="nav-head hidden-xs your-shelves">{{_('Your Shelves')}}</li>
-                {% for shelf in g.user.shelf %}
-                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span>{{shelf.name|shortentitle(40)}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
-                {% endfor %}-->
               {% if not g.user.is_anonymous %}
                 <li id="nav_createshelf" class="create-shelf"><a href="{{url_for('shelf.create_shelf')}}">{{_('Create a Shelf')}}</a></li>
                 <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('about.stats')}}"><span class="glyphicon glyphicon-info-sign"></span> {{_('About')}}</a></li>
@@ -155,29 +151,29 @@
           {% if pagination and (pagination.has_next or pagination.has_prev) %}
             <div class="pagination">
               {% if pagination.has_prev %}
-              <a class="previous" href="{{ (pagination.page - 1)|url_for_other_page
-                }}">&laquo; {{_('Previous')}}</a>
+              <li class="page-item page-previous"><a class="page-link" aria-label="next page" href="{{ (pagination.page - 1)|url_for_other_page
+                }}">&laquo; {{_('Previous')}}</a></li>
               {% endif %}
             {% for page in pagination.iter_pages() %}
               {% if page %}
                 {% if page != pagination.page %}
-                  <a href="{{ (page)|url_for_other_page }}">{{ page }}</a>
+                  <li class="page-item"><a class="page-link" aria-label="to page {{ page }}" href="{{ (page)|url_for_other_page }}">{{ page }}</a></li>
                 {% else %}
-                  <strong>{{ page }}</strong>
+                  <li class="page-item active"><a class="page-link" aria-label="to page {{ page }}" href="{{ (page)|url_for_other_page }}">{{ page }}</a></li>
                 {% endif %}
               {% else %}
-                <span class="ellipsis">…</span>
+                <li class="page-item page-last-separator disabled"><a class="page-link" aria-label="">…</a></li>
               {% endif %}
             {% endfor %}
             {% if pagination.has_next %}
-              <a class="next" href="{{ (pagination.page + 1)|url_for_other_page
-                }}">{{_('Next')}} &raquo;</a>
+              <li class="page-item page-next"><a class="page-link next" aria-label="next page" href="{{ (pagination.page + 1)|url_for_other_page
+                }}">{{_('Next')}} &raquo;</a></li>
             {% endif %}
             </div>
           {% endif %}
-        </div>
       </div>
     </div>
+  </div>
     <div class="modal fade" id="bookDetailsModal" tabindex="-1" role="dialog" aria-labelledby="bookDetailsModalLabel">
       <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
@@ -193,10 +189,7 @@
       </div>
     </div>
     {% block modal %}{% endblock %}
-
-
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <!--script src="https://code.jquery.com/jquery.js"></script-->
     <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="{{ url_for('static', filename='js/libs/bootstrap.min.js') }}"></script>
@@ -205,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({
@@ -222,18 +208,15 @@
               modalFooter: "{{_('Close')}}",
               modalTitleFailed: "{{_('Error')}}"
             });
-            $("#btn-upload").change(function() {
-                $("#form-upload").submit();
-            });
-            $(document).ready(function() {
-              var inp = $('#query').first()
-              var val = inp.val()
-              if (val !== "undefined") {
-                  inp.val('').blur().focus().val(val)
-              }
-            });
         });
     </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/list.html b/cps/templates/list.html
index a2938be1..53a712d1 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -8,8 +8,8 @@
         <button id="sort_name" class="btn btn-primary"><b>B,A <-> A B</b></button>
        {% endif %}
       {% endif %}
-      <button id="desc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
-      <button id="asc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
+      <button id="desc" data-id="{{ data }}" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
+      <button id="asc" data-id="{{ data }}" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
       {% if charlist|length %}
       <button id="all" class="btn btn-primary">{{_('All')}}</button>
       {% endif %}
@@ -20,7 +20,7 @@
       </div>
 
       {% if data == "series" %}
-      <button class="update-view btn btn-primary" href="#" data-target="series_view" data-view="grid">Grid</button>
+      <button class="update-view btn btn-primary" href="#" data-target="series_view" id='grid-button' data-view="grid">Grid</button>
       {% endif %}
     </div>
   <div class="container">
@@ -32,7 +32,7 @@
       {% endif %}
       <div class="row" {% if entry[0].sort %}data-name="{{entry[0].name}}"{% endif %} data-id="{% if entry[0].sort %}{{entry[0].sort}}{% else %}{% if entry.name %}{{entry.name}}{% else %}{{entry[0].name}}{% endif %}{% endif %}">
         <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{entry.count}}</span></div>
-        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{% if entry.format %}{{url_for('web.books_list', data=data, sort='new', book_id=entry.format )}}{% else %}{{url_for('web.books_list', data=data, sort='new', book_id=entry[0].id )}}{% endif %}">
+        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{% if entry.format %}{{url_for('web.books_list', data=data, sort_param='new', book_id=entry.format )}}{% else %}{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].id )}}{% endif %}">
           {% if entry.name %}
           <div class="rating">
           {% for number in range(entry.name) %}
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/logviewer.html b/cps/templates/logviewer.html
index e74ec27e..9827d15e 100644
--- a/cps/templates/logviewer.html
+++ b/cps/templates/logviewer.html
@@ -12,7 +12,18 @@
       <label for="log0">{{_('Show Access Log: ')}}</label>{{logfiles[1]}}</div>
      {% endif %}
    </div>
+  <div class="row">
+    <div class="col-xs-6 col-sm-7">
+      {% if log_enable %}
+      <div class="btn btn-default"><a id="log_file" href="{{url_for('admin.download_log', logtype=0)}}">{{_('Download Calibre-Web Log')}}</a></div>
+      {% endif %}
+      {% if accesslog_enable %}
+      <div class="btn btn-default"><a id="log_file" href="{{url_for('admin.download_log', logtype=1)}}">{{_('Download Access Log')}}</a></div>
+      {% endif %}
+    </div>
+  </div>
    <div id="renderer" class="log"></div>
+
 {% endblock %}
 {% block js %}
 <script src="{{ url_for('static', filename='js/logviewer.js') }}"></script>
diff --git a/cps/templates/modal_dialogs.html b/cps/templates/modal_dialogs.html
new file mode 100644
index 00000000..da00834c
--- /dev/null
+++ b/cps/templates/modal_dialogs.html
@@ -0,0 +1,123 @@
+{% macro restrict_modal() %}
+<div class="modal fade" id="restrictModal" tabindex="-1" role="dialog" aria-labelledby="restrictModalLabel">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title hidden" id="h1">{{_('Select Allowed/Denied Tags')}}</h4>
+        <h4 class="modal-title hidden" id="h2">{{_('Select Allowed/Denied Custom Column Values')}}</h4>
+        <h4 class="modal-title hidden" id="h3">{{_('Select Allowed/Denied Tags of User')}}</h4>
+        <h4 class="modal-title hidden" id="h4">{{_('Select Allowed/Denied Custom Column Values of User')}}</h4>
+      </div>
+      <div class="modal-body">
+          <table class="table table-no-bordered" id="restrict-elements-table" data-id-field="id" data-show-header="false" data-editable-mode="inline">
+            <thead>
+              <tr>
+                  <th data-field="Element" id="Element" data-editable-type="text" data-editable="true" data-editable-title="{{_('Enter Tag')}}"></th>
+                  <th data-field="type" id="type" data-visible="true"></th>
+                  <th data-field="id" id="id" data-visible="false"></th>
+                  <th data-align="right" data-formatter="RestrictionActions"></th>
+              </tr>
+            </thead>
+          </table>
+          <form id="add_restriction" action="" method="POST">
+          <div class="form-group required">
+            <label for="add_element">{{_('Add View Restriction')}}</label>
+            <input type="text" class="form-control" name="add_element" id="add_element" >
+          </div>
+          <div class="form-group required">
+            <input type="button" class="btn btn-default" value="{{_('Allow')}}" name="submit_allow" id="submit_allow" data-dismiss="static">
+            <input type="button" class="btn btn-default" value="{{_('Deny')}}" name="submit_deny" id="submit_restrict" data-dismiss="static">
+          </div>
+          </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" id="restrict_close" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endmacro %}
+{% macro delete_book() %}
+{% if g.user.role_delete_books() %}
+<div class="modal fade" id="deleteModal" role="dialog" aria-labelledby="metaDeleteLabel">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-danger text-center">
+          <span>{{_('Are you really sure?')}}</span>
+      </div>
+        <div class="modal-body text-center">
+          <p>
+          <span class="hidden" id="book_format">{{_('This book format will be permanently erased from database')}}</span>
+          <span class="hidden" id="book_complete">{{_('This book will be permanently erased from database')}}</span>
+          <span>{{_('and hard disk')}}</span>
+		  </p>
+          {% if config.config_kobo_sync %}
+          <p>
+            <span>{{_('Important Kobo Note: deleted books will remain on any paired Kobo device.')}}</span>
+            <span>{{_('Books must first be archived and the device synced before a book can safely be deleted.')}}</span>
+          </p>
+          {% endif %}
+        </div>
+
+      <div class="modal-footer">
+        <input type="button" class="btn btn-danger" value="{{_('Delete')}}" name="delete_confirm" id="delete_confirm" data-dismiss="modal">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</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/modal_restriction.html b/cps/templates/modal_restriction.html
deleted file mode 100644
index 26aa2ee1..00000000
--- a/cps/templates/modal_restriction.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% macro restrict_modal() %}
-<div class="modal fade" id="restrictModal" tabindex="-1" role="dialog" aria-labelledby="restrictModalLabel">
-  <div class="modal-dialog modal-lg" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title hidden" id="h1">{{_('Select Allowed/Denied Tags')}}</h4>
-        <h4 class="modal-title hidden" id="h2">{{_('Select Allowed/Denied Custom Column Values')}}</h4>
-        <h4 class="modal-title hidden" id="h3">{{_('Select Allowed/Denied Tags of User')}}</h4>
-        <h4 class="modal-title hidden" id="h4">{{_('Select Allowed/Denied Custom Column Values of User')}}</h4>
-      </div>
-      <div class="modal-body">
-          <table class="table table-no-bordered" id="restrict-elements-table" data-id-field="id" data-show-header="false" data-editable-mode="inline">
-            <thead>
-              <tr>
-                  <th data-field="Element" id="Element" data-editable-type="text" data-editable="true" data-editable-title="{{_('Enter Tag')}}"></th>
-                  <th data-field="type" id="type" data-visible="true"></th>
-                  <th data-field="id" id="id" data-visible="false"></th>
-                  <th data-align="right" data-formatter="RestrictionActions"></th>
-              </tr>
-            </thead>
-          </table>
-          <form id="add_restriction" action="" method="POST">
-          <div class="form-group required">
-            <label for="add_element">{{_('Add View Restriction')}}</label>
-            <input type="text" class="form-control" name="add_element" id="add_element" >
-          </div>
-          <div class="form-group required">
-            <input type="button" class="btn btn-default" value="{{_('Allow')}}" name="submit_allow" id="submit_allow" data-dismiss="static">
-            <input type="button" class="btn btn-default" value="{{_('Deny')}}" name="submit_deny" id="submit_restrict" data-dismiss="static">
-          </div>
-          </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" id="restrict_close" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
-      </div>
-    </div>
-  </div>
-</div>
-{% endmacro %}
diff --git a/cps/templates/read.html b/cps/templates/read.html
index a4361fa0..b38f783c 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -78,7 +78,7 @@
           </div>
       </div>
       <div class="overlay"></div>
-
+      <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/jszip.min.js') }}">
       </script> <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
       <script type="text/javascript">
@@ -91,10 +91,7 @@
               useBookmarks: "{{ g.user.is_authenticated | tojson }}"
           };
       </script>
-      <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/libs/jszip.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/reading/epub.js') }}"></script>
     </body>
diff --git a/cps/templates/readcbr.html b/cps/templates/readcbr.html
index 14b9752c..35943b34 100644
--- a/cps/templates/readcbr.html
+++ b/cps/templates/readcbr.html
@@ -13,9 +13,10 @@
   <link rel="stylesheet" href="{{ url_for('static', filename='css/kthoom.css') }}" type="text/css"/>
 
   <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
+  <script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
   <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
   <script src="{{ url_for('static', filename='js/kthoom.js') }}"></script>
-	<script src="{{ url_for('static', filename='js/archive/archive.js') }}"></script>
+  <script src="{{ url_for('static', filename='js/archive/archive.js') }}"></script>
   <script>
     var updateArrows = function() {
       if ($('input[name="direction"]:checked').val() === "0") {
diff --git a/cps/templates/readtxt.html b/cps/templates/readtxt.html
index 46a16d8f..da862fb2 100644
--- a/cps/templates/readtxt.html
+++ b/cps/templates/readtxt.html
@@ -12,6 +12,7 @@
         <!-- EPUBJS Renderer -->
         <!--<script src="../build/epub.js"></script>-->
         <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
+        <script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
 
         <style type="text/css">
 
@@ -97,6 +98,14 @@
           $( "#right" ).click(function() {
             nextPage();
           });
+          $("#readmain").swipe( {
+            swipeRight:function() {
+                prevPage();
+            },
+            swipeLeft:function() {
+                nextPage();
+            },
+          });
           //bind mouse
           $(window).bind('DOMMouseScroll mousewheel', function(event) {
             var delta = 0;
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 da59efa6..d11f3ec8 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -5,7 +5,7 @@
       <h2>{{_('No Results Found')}} {{adv_searchterm}}</h2>
       <p>{{_('Search Term:')}} {{adv_searchterm}}</p>
     {% else %}
-      <h2>{{entries|length}} {{_('Results for:')}} {{adv_searchterm}}</h2>
+      <h2>{{result_count}} {{_('Results for:')}} {{adv_searchterm}}</h2>
       {% if g.user.is_authenticated %}
         {% if g.user.shelf.all() or g.shelves_access %}
           <div id="shelf-actions" class="btn-toolbar" role="toolbar">
@@ -25,27 +25,28 @@
           </div>
         {% endif %}
       {% endif %}
-      <!--div class="filterheader hidden-xs hidden-sm"--><!-- ToDo: Implement filter for search results -->
-        <!--a id="new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='new')}}"><span class="glyphicon glyphicon-sort-by-order"></span></a>
-        <a id="old" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='old')}}"><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
-        <a id="asc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='abc')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
-        <a id="desc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='zyx')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
-        <a id="pub_new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubnew')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
-        <a id="pub_old" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+      <div class="filterheader hidden-xs hidden-sm"><!-- ToDo: Implement filter for search results -->
+        <a id="new" data-toggle="tooltip" title="{{_('Sort according to book date, newest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='new', query=query)}}"><span class="glyphicon glyphicon-sort-by-order"></span></a>
+        <a id="old" data-toggle="tooltip" title="{{_('Sort according to book date, oldest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='old', query=query)}}"><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+        <a id="asc" data-toggle="tooltip" title="{{_('Sort title in alphabetical order')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='abc', query=query)}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
+        <a id="desc" data-toggle="tooltip" title="{{_('Sort title in reverse alphabetical order')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='zyx', query=query)}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
+        <a id="auth_az" data-toggle="tooltip" title="{{_('Sort authors in alphabetical order')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='authaz', query=query)}}"><span class="glyphicon glyphicon-user"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
+        <a id="auth_za" data-toggle="tooltip" title="{{_('Sort authors in reverse alphabetical order')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='authza', query=query)}}"><span class="glyphicon glyphicon-user"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
+        <a id="pub_new" data-toggle="tooltip" title="{{_('Sort according to publishing date, newest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='pubnew', query=query)}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
+        <a id="pub_old" data-toggle="tooltip" title="{{_('Sort according to publishing date, oldest first')}}" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort_param='pubold', query=query)}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
       </div>
-      <div class="btn-group character" role="group">
-        <a id="no_shelf" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubold')}}"><span class="glyphicon glyphicon-list"></span><b>?</b></a>
-        <div id="all" class="btn btn-primary">{{_('All')}}</div>
-      </div-->
   {% endif %}
 
-  <div class="row">
+  <div class="row display-flex">
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <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>
@@ -59,7 +60,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
               {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -67,15 +68,24 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.data %}
-            {% if format.format|lower == 'mp3' %}
+            {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
+
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index fdc2990b..050028ac 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -1,7 +1,8 @@
 {% extends "layout.html" %}
 {% block body %}
+<h1 class="{{page}}">{{title}}</h1>
 <div class="col-md-10 col-lg-6">
-  <form role="form" id="search" action="{{ url_for('web.advanced_search') }}" method="GET">
+  <form role="form" id="search" action="{{ url_for('web.advanced_search_form') }}" method="POST">
     <div class="form-group">
       <label for="book_title">{{_('Book Title')}}</label>
       <input type="text" class="form-control" name="book_title" id="book_title" value="">
@@ -30,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 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 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">
@@ -188,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 5635705a..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">
-
+  <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">
@@ -31,7 +46,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -39,10 +54,18 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
@@ -60,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">
@@ -74,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 164fd6d2..77251e02 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -12,8 +12,9 @@
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
     <link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
-    {% if g.user.get_theme == 1 %}
-       <link href="{{ url_for('static', filename='css/caliBlur-style.css') }}" rel="stylesheet" media="screen">
+    {% if g.current_theme == 1 %}
+       <link href="{{ url_for('static', filename='css/caliBlur.css') }}" rel="stylesheet" media="screen">
+       <link href="{{ url_for('static', filename='css/caliBlur_override.css') }}" rel="stylesheet" media="screen">
     {% endif %}
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -24,11 +25,11 @@
 
     {% block header %}{% endblock %}
   </head>
-  <body class="{{ page }}">
+  <body class="{{ page }} shelf-down">
 {% block body %}
 <div class="discover">
   <h2>{{title}}</h2>
-  <div class="row">
+  <div class="row display-flex">
 
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
@@ -37,37 +38,31 @@
         <p class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
           {% for author in entry.authors %}
-            <a href="{{url_for('web.books_list',  data='author', sort='new', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
+            <a href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
           {% endfor %}
         </p>
-
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index}})
+        </p>
+        {% endif %}
       </div>
 
 	  <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
-          {% 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/stats.html b/cps/templates/stats.html
index 966abf2a..052c920a 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -26,7 +26,7 @@
   </tbody>
 </table>
 {% if g.user.role_admin() %}
-  <h3>{{_('Linked Libraries')}}</h3>
+  <h3>{{_('System Statistics')}}</h3>
 <table id="libs" class="table">
   <thead>
     <tr>
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 2648dd7c..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,35 +125,19 @@
         </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>
-
-  {% if downloads %}
-    <div class="col-sm-12">
-    <h2>{{_('Recent Downloads')}}</h2>
-    {% for entry in downloads %}
-      <div class="col-sm-2">
-        <a class="pull-left" href="{{ url_for('web.show_book', book_id=entry.id) }}">
-          <img class="media-object cover-small" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="...">
-        </a>
-      </div>
-    {% endfor %}
-    </div>
-  {% endif %}
 </div>
+
     <div class="modal fade" id="modal_kobo_token" tabindex="-1" role="dialog" aria-labelledby="kobo_tokenModalLabel">
       <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
@@ -169,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 1b22544a..cd030e69 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 7eafabda..0aafd7b9 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+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"
@@ -15,382 +15,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "nainstalováno"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "není nainstalováno"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statistika"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server restartován, znovu načtěte stránku"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Vypínám server, zavřete okno"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Úspěšně obnovené připojení"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Stránka správce"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Opravdu chcete odstranit Kobo token?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 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:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 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:721
 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:555
+#: cps/admin.py:727
 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:581
+#: cps/admin.py:757
 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:594
+#: cps/admin.py:772
 #, 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:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, 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:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "Umístění certifikátu LDAP není platné, zadejte prosím správnou cestu"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 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:634
+#: cps/admin.py:834
 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:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 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:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Databáze není zapisovatelná"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Došlo k neznámé chybě."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, 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:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 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:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 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:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Chyba: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "není nakonfigurováno"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Formát knihy úspěšně smazán"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "upravit metadata"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s není platným jazykem"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 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:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, 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:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, 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:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Nepodařilo se přesunout soubor %(file)s: %(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, 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:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, 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"
@@ -399,184 +444,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formát pro knihu: %(book)d nenalezen"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Poslat do Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Tento e-mail byl odeslán přes Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nenalezen: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Poslat do Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Tento e-mail byl odeslán přes Calibre-Web."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web zkušební e-mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Zkušební e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Začínáme s Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrační e-mail pro uživatele: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Poslat %(format)s do Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Převést %(orig)s do %(format)s a poslat do Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Požadovaný soubor nelze přečíst. Možná nesprávná oprávnění?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Mazání knihy selhalo %(id)s failed: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Mazání knihy %(id)s, cesta ke knize není platná %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Přejmenování názvu z: '%(src)s' na '%(dest)s'  selhalo chybou: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Přejmenovat autora z: '%(src)s' na '%(dest)s' selhalo chybou: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Přejmenování souboru v cestě '%(src)s' na '%(dest)s' selhalo  chybou: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Soubor %(file)s nenalezen na Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Chyba stahování obalu"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Chyba formátu obalu"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Vytvoření cesty obalu selhalo"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Soubor obalu není platný, nebo nelze uložit"
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Pouze jpg/jpeg jsou podporované soubory pro obal"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "Chyba provádění UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Čekám"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Spuštěno"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Převést:"
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Nahrát:"
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Neznámá úloha:"
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Pro získání platného api_endpoint pro zařízení Kobo, přístupte na calibre-web bez localhost"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Kobo nastavení"
 
@@ -585,540 +609,555 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Přihlášení pomocí GitHub selhalo."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 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:162
 msgid "Failed to log in with Google."
 msgstr "Přihlášení pomocí Google selhalo."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 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:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, 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:229
 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:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Odpojení od %(oauth)s úspěšné"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Odpojení od %(oauth)s selhalo"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 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:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "přihlásit se"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Token nenalezen"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Token vypršel"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Úspěch! Vraťte se prosím do zařízení"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Knihy"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+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:735
+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
-#, 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Vytvořit polici"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, 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:231
+msgid "Edit a shelf"
+msgstr "Upravit polici"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Police %(title)s vytvořena"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Došlo k chybě"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Vytvořit polici"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Police %(title)s změněna"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Upravit polici"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Došlo k chybě"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Police: '%(name)s'"
+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: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:291
+#, 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:409
-msgid "Hidden Book"
-msgstr "Skrytá kniha"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Nedávno přidáné"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Police: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Zobrazit nedávné knihy"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Žhavé knihy"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Zobrazit žhavé knihy"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Nejlépe hodnocené knihy"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Zobrazit nejlépe hodnocené knihy"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Přečtené knihy"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Zobrazit prečtené a nepřečtené"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Nepřečtené knihy"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Zobrazit nepřečtené"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Objevte"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Zobrazit náhodné knihy"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Kategorie"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Zobrazit výběr kategorie"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Série"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Zobrazit výběr sérií"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Autoři"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Zobrazit výběr autora"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Vydavatelé"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Zobrazit výběr vydavatele"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Jazyky"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Zobrazit výběr jazyka"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Hodnocení"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Zobrazit výběr hodnocení"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Formáty souborů"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Zobrazit výběr formátů"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "Archivované knihy"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "Zobrazit archivované knihy"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Neočekávaná data při čtení informací o aktualizaci"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Aktualizace není k dispozici. Máte nainstalovanou nejnovější verzi"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizujte na nejnovější verzi."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Nelze získat informace o aktualizaci"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Nejsou k dispozici žádné informace o verzi"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizujte na verzi: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klepnutím na tlačítko níže aktualizujte na nejnovější stabilní verzi."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr "Uživatel úspěšně importován"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Nedávno přidané knihy"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Knihy"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Seznam hodnocení"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Seznam formátů"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Úlohy"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Hledat"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Vydáno po "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Vydáno před "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Hodnocení <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Hodnocení >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "hledat"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Rozšířené hledání"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Hledat"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Seznam hodnocení"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Seznam formátů"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Vydáno po "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Vydáno před "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Hodnocení <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Hodnocení >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "registrovat"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, 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:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "přihlásit se"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Token nenalezen"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Token vypršel"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Úspěch! Vraťte se prosím do zařízení"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Číst knihu"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre převaděč %(tool)s nenalezen"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Převaděč eknih selhal: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-převaděč selhal: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, 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:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Převaděč eknih selhal: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Uživatelé"
@@ -1157,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:62
 msgid "Download"
 msgstr "Stahovat"
 
@@ -1170,8 +1208,8 @@ msgid "Edit"
 msgstr "Upravovat"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1183,11 +1221,11 @@ msgstr "Veřejná police"
 msgid "Add New User"
 msgstr "Přidat nového uživatele"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "Importovat LDAP uživatele"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "Nastavení e-mailového serveru SMTP"
 
@@ -1195,145 +1233,150 @@ msgstr "Nastavení e-mailového serveru SMTP"
 msgid "SMTP Hostname"
 msgstr "SMTP hostitel"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP přihlášení"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Z e-mailu"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfigurace"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Calibre DB adresář"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Úroveň logu"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Knihy na stránku"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Nahrávání"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Anonymní prohlížení"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Veřejná registrace"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Magic Link vzdálené přihlášení"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Reverzní proxy přihlášení"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Název záhlaví reverzního prixy"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Upravit základní konfiguraci"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Upravit konfiguraci uživatelského rozhraní"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Správa"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Zobrazit log"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Znovupřipojení ke Calibre databázi"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Restartovat"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Vypnout"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Verze"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Detaily"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Současná verze"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Zkontrolovat aktualizace"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Provést aktualizaci"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Probíhá aktualizace, prosím nenačítejte stránku znovu"
 
@@ -1345,20 +1388,44 @@ msgstr "přes"
 msgid "In Library"
 msgstr "V knihovně"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Vše"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Více od"
 
@@ -1390,17 +1457,17 @@ msgstr "Převést do:"
 msgid "Convert book"
 msgstr "Převést knihu"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Název knihy"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1408,15 +1475,15 @@ msgstr "Popis"
 msgid "Identifiers"
 msgstr "Identifikátory"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -1424,7 +1491,7 @@ msgstr "Odstranit"
 msgid "Add Identifier"
 msgstr "Přidat identifikátor"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Štítky"
 
@@ -1436,390 +1503,494 @@ msgstr "ID série"
 msgid "Rating"
 msgstr "Hodnocení"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Adresa URL obalu (jpg, obal je stažen a uložen v databázi, pole je potom opět prázdné)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Nahrát obal z místní jednotky"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Datum vydání"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Jazyk"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ne"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Nahrát formát"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Zobrazit knihu po uložení"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Jste si opravdu jisti?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Tato kniha bude trvale odstraněna z databáze"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "a z hard disku"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Důležitá Kobo poznámka: smazané knihy zůstanou na jakémkoli spárovaném zařízení Kobo."
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Knihy musí být nejprve archivovány a zařízení musí být synchronizováno, než bude kniha bezpečně smazána."
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Klíčové slovo"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "Hledat klíčové slovo"
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Zdroj"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Chyba vyhledávání!"
 
-#: cps/templates/book_edit.html:297
+#: 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."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Název"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Jste si opravdu jisti?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Konfigurace knihovny"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
-msgstr "Cesta certifikátu LDAP"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP Ověření"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonymní"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Neověřeno"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Jednoduché"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Uživatelské jméno správce LDAP"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Heslo správce LDAP"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Rozlišující název LDAP (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Filtr objektu uživatele LDAP"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Server LDAP je OpenLDAP?"
 
-#: cps/templates/config_edit.html:304
+#: 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:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtr objektů skupiny LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Jméno skupiny LDAP"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Pole členů skupiny LDAP"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externí binární soubory"
 
-#: cps/templates/config_edit.html:352
+#: 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:360
+#: 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:363
+#: 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:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Umístění Unrar binarních souborů"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1828,10 +1999,6 @@ msgstr "Přihlásit"
 msgid "View Configuration"
 msgstr "Prohlížet konfiguraci"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Název"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Počet náhodných knih k zobrazení"
@@ -1840,7 +2007,7 @@ msgstr "Počet náhodných knih k zobrazení"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Počet autorů k zobrazení před skrytím (0 = Zakázat skrytí)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Motiv"
 
@@ -1974,7 +2141,7 @@ msgstr "Přidat do police"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Veřejné)"
 
@@ -2022,11 +2189,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Další"
 
@@ -2034,6 +2197,10 @@ msgstr "Další"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Otevřte soubor .kobo/Kobo eReader.conf v textovém editoru a vložte (nebo upravte):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Vše"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "Vytvořit problém"
@@ -2042,9 +2209,23 @@ msgstr "Vytvořit problém"
 msgid "Return to Home"
 msgstr "Zpět domů"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Seřadit podle serií"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2114,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Zpět"
 
@@ -2127,12 +2307,8 @@ msgstr "Přepnout navigaci"
 msgid "Search Library"
 msgstr "Hledat v knihovně"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Rozšířené hledání"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -2148,7 +2324,7 @@ msgstr "Odhlásit se"
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Nahrávání..."
 
@@ -2160,27 +2336,23 @@ msgstr "Prosím neobnovujte stránku"
 msgid "Browse"
 msgstr "Procházet"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Vaše police"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "O knihovně"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Předchozí"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Chyba"
 
@@ -2212,30 +2384,82 @@ msgstr "Streamový výstup, nelze zobrazit"
 msgid "Show Access Log: "
 msgstr "Zobrazit log přístupu: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Vybrat povolené/zakázané štítky"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Vybrat povolené/zakázané hodnoty vlastních sloupců"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Vybrat povolené/zakázané uživatelské štítky"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Vybrat povolené/zakázané hodnoty vlastních sloupců uživatele"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Vložte štítek"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Přidat omezení náhledu"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Tato kniha bude trvale odstraněna z databáze"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "a z hard disku"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Důležitá Kobo poznámka: smazané knihy zůstanou na jakémkoli spárovaném zařízení Kobo."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Knihy musí být nejprve archivovány a zařízení musí být synchronizováno, než bude kniha bezpečně smazána."
+
+#: cps/templates/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"
@@ -2244,99 +2468,99 @@ msgstr "Calibre-Web katalog eknih"
 msgid "Reflow text when sidebars are open."
 msgstr "Po otevření postranních panelů přeformátujte text."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Předchozí strana"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Následujicí strana"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Změnit měřítko na nejlepší"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Změnit měřítko na šířku"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Změnit měřítko na výšku"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Změnit měřítko na nativní"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Převrátit obrázek"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Světlý"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Tmavý"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Měřítko"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Nejlepší"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Šířka"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Výška"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Nativní"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Otočit"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Převrátit"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Vodorovně"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Svisle"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Směr"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Zleva doprava"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Zprava doleva"
 
@@ -2388,39 +2612,43 @@ msgstr "Termín vyhledávání:"
 msgid "Results for:"
 msgstr "Výsledky pro:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Datum vydání od"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Datum vydání do"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Vynechat štítky"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Vynechat série"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Vynechat jazyky"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Přípony"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Vynechat přípony"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Hodnoceni více než"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Hodnocení méně než"
 
@@ -2429,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:67
-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:70
+#: 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"
 
@@ -2452,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"
@@ -2473,8 +2709,8 @@ msgid "Series in this Library"
 msgstr "Sérií v této knihovně"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Propojené knihovny"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2552,19 +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:146
-msgid "Recent Downloads"
-msgstr "Nedávná stahování"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Vygenerovat URL pro Kobo Auth"
 
-#: cps/templates/user_edit.html:178
-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 c2b507a2..acf955fe 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 1f42308a..c74311ad 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -5,393 +5,439 @@
 # FIRST AUTHOR OzzieIsaacs, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-Web\n"
+"Project-Id-Version: Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-01 20:17+0200\n"
-"PO-Revision-Date: 2020-06-02 20:57+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
+"PO-Revision-Date: 2021-02-02 19:04+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "Installiert"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet, Seite bitte neu laden"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Erfolgreich neu verbunden"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Möchten Sie wirklich den Kobo Token löschen?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr "Möchten Sie wirklich diese Domain löschen?"
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr "Möchten Sie wirklich diesen Benutzer löschen?"
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Möchten Sie wirklich dieses Bücherregal löschen?"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 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:721
 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:555
+#: cps/admin.py:727
 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:581
+#: cps/admin.py:757
 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:594
+#: cps/admin.py:772
 #, 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:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, 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:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "LDAP Zertifikat Pfad ist ungültig, bitte einen gültigen Pfad angeben"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "Der LDAP Member User Filter benötigt genau eine \"%s\" Formatierungsmarkierung"
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "LDAP Member User Filter hat eine ungleiche Anzahl von geöffneten und geschlossenen Klammern"
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "LDAP CA-Zertifikat, Zertifikat oder Key Datei ist kein gültiger Pfad"
+
+#: cps/admin.py:828
 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:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 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:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Datenbank ist nicht schreibbar"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 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:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Fehler: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr "{} Benutzer erfolgreich importiert"
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "Nicht konfiguriert"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Buch Format erfolgreich gelöscht"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
-msgstr "Buch erfolgreich geschlöscht"
+msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ist keine gültige Sprache"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Fehler beim Verschieben der Datei %(file)s: %(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, 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:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
@@ -400,184 +446,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s Format für Buch-ID %(book)d nicht gefunden"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "An Kindle senden"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nicht gefunden: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "An Kindle senden"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web Test-E-Mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Test-E-Mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrierungs-E-Mail für Benutzer %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Sende %(format)s an Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konvertiere %(orig)s nach %(format)s und sende an Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-Mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Die angeforderte Datei konnte nicht gelesen werden. Evtl. falsche Zugriffsrechte?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr ""
+msgstr "Löschen des Ordners für Buch %(id)s ist fehlgeschlagen, der Pfad hat Unterordner: %(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Löschen von Buch %(id)s fehlgeschlagen: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Lösche Buch %(id)s, Pfad zum Buch nicht gültig: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen des Titels '%(src)s' zu '%(dest)s' schlug fehl: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Umbenennen des Authors '%(src)s' zu '%(dest)s' schlug fehl: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen der Datei im Pfad '%(src)s' nach '%(dest)s' ist fehlgeschlagen: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Fehler beim Herunterladen des Covers"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Coverdatei fehlerhaft"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Fehler beim Erzeugen des Ordners für die Coverdatei"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Cover Datei ist keine gültige Bilddatei, kann nicht gespeichert werden"
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "Nur jpg/jpeg/png/webp/bmp Dateien werden als Coverdatei unterstützt"
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg Dateien als Cover untertützt"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-Mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konvertiere: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Upload: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Unbekannte Aufgabe: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Bitte nicht von \"localhost\" auf Calibre-Web zugreifen, um einen gültigen  api_endpoint für Kobo Geräte zu erhalten"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Kobo Setup"
 
@@ -586,540 +611,555 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Login mit Github fehlgeschlagen."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Laden der Benutzerinformationen von Github fehlgeschlagen."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Login mit Google fehlgeschlagen."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Laden der Benutzerinformationen von Google fehlgeschlagen."
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Verbindung mit %(oauth)s erfolgreich"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 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:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Verbindung zu %(oauth)s erfolgreich getrennt"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Verbindung mit %(oauth)s fehlgeschlagen"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr ""
+msgstr "Nicht mit  %(oauth)s verbunden"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 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:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "Login"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Token wurde nicht gefunden"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Token ist abgelaufen"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Erfolg! Bitte zum Gerät zurückkehren"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Bücher"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+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:735
+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
-#, 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Bücherregal erzeugen"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, 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:231
+msgid "Edit a shelf"
+msgstr "Bücherregal editieren"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Es trat ein Fehler auf"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Bücherregal erzeugen"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Bücherregal editieren"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Bücherregal: '%(name)s'"
+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: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:291
+#, 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:409
-msgid "Hidden Book"
-msgstr "Verstecktes Buch"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Kürzlich hinzugefügt"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Bücherregal: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Zeige kürzlich hinzugefügte Bücher"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Beliebte Bücher"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Zeige beliebte Bücher"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Best bewertete Bücher"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Bestbewertete Bücher anzeigen"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Gelesene Bücher"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Zeige gelesene/ungelesene Bücher"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Ungelesene Bücher"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Zeige Ungelesene"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Entdecke"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Zeige zufällige Bücher"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Kategorien"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Zeige Kategorienauswahl"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Serien"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Zeige Serienauswahl"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Autoren"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Zeige Autorenauswahl"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Verleger"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Zeige Verlegerauswahl"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Sprachen"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Zeige Sprachauswahl"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Bewertungen"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Zeige Bewertungsauswahl"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Dateiformate"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Zeige Dateiformatauswahl"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "Archivierte Bücher"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "Zeige archivierte Bücher"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Updateinformationen enthalten unbekannte Daten"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Kein Update verfügbar. Es ist bereits die aktuellste Version installiert"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Es sind Updates verfügbar. Klicke auf den Button unten, um auf die aktuellste Version zu aktualisieren."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Updateinformationen konnten nicht geladen werden"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Version: %(version)s zu aktualisieren"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicke auf den Button unten, um auf die letzte stabile Version zu aktualisieren."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr "Benutzer erfolgreich hinzugefügt"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Kürzlich hinzugefügte Bücher"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Bücher"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Von %(user)s heruntergeladene Bücher"
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Bewertungsliste"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Liste der Dateiformate"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Suche"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Herausgegeben nach dem "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Herausgegeben vor dem "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Bewertung <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Bewertung >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "Suche"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Erweiterte Suche"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Suche"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Bewertungsliste"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Liste der Dateiformate"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Herausgegeben nach dem "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Herausgegeben vor dem "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Bewertung <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Bewertung >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "Lesestatus = %(status)s"
+
+#: cps/web.py:1246
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr "Ungültiges E-Mail Adressformat"
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 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:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, 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:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "Login"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Token wurde nicht gefunden"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Token ist abgelaufen"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Erfolg! Bitte zum Gerät zurückkehren"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre E-Book Konverter %(tool)s nicht gefunden"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Fehler des EBook-Converters: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s Format nicht gefunden"
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr "EBook Converter mit unbekanntem Fehler fehlgeschlagen"
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify Konverter Aufruf fehlgeschlagen: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, 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:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Fehler des EBook-Converters: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Calibre fehlgeschlagen mit Fehler: %(error)s"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Benutzerliste"
@@ -1158,7 +1198,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:62
 msgid "Download"
 msgstr "Download"
 
@@ -1171,8 +1210,8 @@ msgid "Edit"
 msgstr "Editieren"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1184,11 +1223,11 @@ msgstr "Öffentliches Bücherregal"
 msgid "Add New User"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "LDAP Benutzer importieren"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "Einstellungen des SMTP-Servers"
 
@@ -1196,145 +1235,150 @@ msgstr "Einstellungen des SMTP-Servers"
 msgid "SMTP Hostname"
 msgstr "SMTP-Hostname"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP Port"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP-Login"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Absenderadresse"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Ordner der Calibre-DB"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Loglevel"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
-msgstr ""
+msgstr "Externer Port"
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Bücher pro Seite"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
-msgstr "Lade hoch"
+msgstr "Hochladen"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Anonymes Durchsuchen"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Öffentliche Registrierung"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Remotelogin ('Magischer Link')"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Reverse Proxy Login"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Reverse Proxy Header Name"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr "Debug Daten herunterladen"
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Logdateien ansehen"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Calibre-DB neu verbinden"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Neustart"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Calibre-Web beenden"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Update"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Aktuelle Version"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Nach Update suchen"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Calibre-Web wirklich anhalten?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Updatevorgang, Seite bitte nicht neu laden"
 
@@ -1346,20 +1390,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Bibliothek"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Alle"
+#: 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 "Sortiere nach Buchdatum, Neuestes zuerst"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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 "Sortiere nach Buchdatum, Aältestes zuerst"
+
+#: 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 "Sortiere Titel in alphabetischer Reihenfolge"
+
+#: 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 "Sortiere Titel in umgekehrt alphabetischer Reihenfolge"
+
+#: 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 "Sortiere nach Herausgabedatum, Neueste zuerst"
+
+#: 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 "Sortiere nach Herausgabedatum, Älteste zuerst"
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Mehr von"
 
@@ -1391,17 +1459,17 @@ msgstr "Konvertiere nach:"
 msgid "Convert book"
 msgstr "Konvertiere Buch"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1409,15 +1477,15 @@ msgstr "Beschreibung"
 msgid "Identifiers"
 msgstr "IDs"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1425,7 +1493,7 @@ msgstr "Entfernen"
 msgid "Add Identifier"
 msgstr "ID hinzufügen"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Tags"
 
@@ -1437,390 +1505,494 @@ msgstr "Serien ID"
 msgid "Rating"
 msgstr "Bewertung"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Cover-URL (jpg, Cover wird heruntergeladen und in der Datenbank gespeichert, Feld erscheint anschließend wieder leer)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Coverdatei von Lokalem Laufwerk hochladen"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Herausgabedatum"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nein"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Format hochladen"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Sicher?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Das Buch wird aus der Calibre-Datenbank"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "und von der Festplatte gelöscht"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Wichtiger Kobo Hinweis: Gelöschte Bücher bleiben auf auf allen verbundenen Kobo Geräten erhalten."
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Bücher müssen zuerst archiviert werden und dann mit dem Gerät synchronisiert werden, bevor ein Buch sicher gelöscht werden kann."
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Suchbegriff "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Quelle"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Fehler bei der Suche!"
 
-#: cps/templates/book_edit.html:297
+#: 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."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "Dieses Feld ist erforderlich"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "Buchauswahl zusammenführen"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "Auswahl aufheben"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "Titelsortierung automatisch aktualisieren"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "Autorensortierung automatisch aktualisieren"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "Titel eingeben"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr "Titelsortierung eingeben"
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr "Titelsortierung"
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr "Autorensortierung eingeben"
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr "Autorensortierung"
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr "Autoren eingeben"
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr "Kategorien eingeben"
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr "Serie eingeben"
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr "Titel eingeben"
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr "Serienindex"
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr "Sprache eingeben"
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr "Herausgabedatum"
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr "Herausgeber eingeben"
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Sicher?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr "Bücher werden zusammengeführt. Von Titel:"
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr "In Buch mit Titel:"
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "Zusammenführen"
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Bibliothekskonfiguration"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+msgstr "Calibre-Web mit -f option starten um die serverseiten Dateiauswahl zu aktivieren"
+
+#: 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 ""
+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:268
-msgid "LDAP Certificate Path"
-msgstr "LDAP Zertifikats Pfad"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP CA-Zertifikat Pfad (Nur für Client Zertifikat Authentifizierung benötigt)"
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP Zertifikat Pfad (Nur für Client Zertifikat Authentifizierung benötigt)"
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP Keyfile Pfad (Nur für Client Zertifikat Authentifizierung benötigt)"
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP Authentifizierung"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Unauthentifiziert"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Einfach"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP Administrator Benutzername"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP Administrator Passwort"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Ist der LDAP-Server ein OpenLDAP-Server?"
 
-#: cps/templates/config_edit.html:304
+#: 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:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "LDAP Gruppen Objekt Filter"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP Gruppen Name"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP Gruppen Mitglieds Feld"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr "LDAP Member User Filter Erkennung"
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr "Automatisch erkennen"
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr "Benutzerdefinierter Filter"
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr "LDAP Member User Filter"
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externe Programme"
 
-#: cps/templates/config_edit.html:352
+#: 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:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Calibre E-Book Konverter Einstellungen"
 
-#: cps/templates/config_edit.html:363
+#: 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:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Pfad zur UnRar-Binärdatei"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1829,10 +2001,6 @@ msgstr "Login"
 msgid "View Configuration"
 msgstr "Ansichtskonfiguration"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Anzahl anzuzeigender zufälliger Bücher"
@@ -1841,7 +2009,7 @@ msgstr "Anzahl anzuzeigender zufälliger Bücher"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Anzahl in Übersicht anzuzeigender Autoren (0=alle werden angezeigt)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Theme"
 
@@ -1975,7 +2143,7 @@ msgstr "Zu Bücherregal hinzufügen"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Öffentlich)"
 
@@ -2023,11 +2191,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Nächste"
 
@@ -2035,17 +2199,35 @@ msgstr "Nächste"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Öffne ddie .kobo/Kobo eReader.conf Datei in einem Texteditor und füge hinzu (oder ersetze):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Alle"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
-msgstr "Issue erzeuge"
+msgstr "Issue erzeugen"
 
 #: cps/templates/http_error.html:45
 msgid "Return to Home"
 msgstr "Zurück zur Hauptseite"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Nach Serien gruppieren"
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
+msgid "Sort authors in alphabetical order"
+msgstr "Sortiere Autoren in alphabetischer Reihenfolge"
+
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr "Sortiere Autoren in umgekehrt alphabetischer Reihenfolge"
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr "Sortiere Serienindex aufsteigend"
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr "Sortiere Serienindex absteigend"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2115,8 +2297,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Zurück"
 
@@ -2128,12 +2309,8 @@ msgstr "Nagivation umschalten"
 msgid "Search Library"
 msgstr "Bibiliothek durchsuchen"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Erweiterte Suche"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -2149,7 +2326,7 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Lade hoch..."
 
@@ -2161,27 +2338,23 @@ msgstr "Bitte die Seite nicht neu laden"
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Deine Bücherregale"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Über"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Vorheriger Eintrag"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Buchdetails"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Fehler"
 
@@ -2213,30 +2386,82 @@ msgstr "Stream Ausgabe, kann nicht angezeigt werden"
 msgid "Show Access Log: "
 msgstr "Zugriffslogbuch anzeigen: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Calibre-Web Logdatei herunterladen"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Zugriffslogbuch herunterladen"
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Erlaubte/verbotene Tags auswählen"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten auswählen"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Erlaubte/Verbotene Tags des Benutzers auswählen"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Erlaubte/Verbotene Calibre Spalten des Benutzers auswählen"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Tag eingeben"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Sichtbeschränkung hinzufügen"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Dieses Buchformat wird permanent aus der Datenbank gelöscht"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Das Buch wird aus der Calibre-Datenbank"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "und von der Festplatte gelöscht"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Wichtiger Kobo Hinweis: Gelöschte Bücher bleiben auf auf allen verbundenen Kobo Geräten erhalten."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Bücher müssen zuerst archiviert werden und dann mit dem Gerät synchronisiert werden, bevor ein Buch sicher gelöscht werden kann."
+
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr "Dateispeicherort auswählen"
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr "Typ"
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr "Name"
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr "Größe"
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr "Übergeordnetes Verzeichnis"
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr "Auswahl"
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web E-Book-Katalog"
@@ -2245,99 +2470,99 @@ msgstr "Calibre-Web E-Book-Katalog"
 msgid "Reflow text when sidebars are open."
 msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Optimale Skalierung"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Skaliere auf Breite"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Skaliere auf Höhe"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Skaliere 1:1"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Rechts rotieren"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Links rotieren"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Bild umdrehen"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Hell"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Dunkel"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Skalierung"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Breite"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Höhe"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "1:1"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Rotieren"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Umdrehen"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Leserichtung"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Links nach rechts"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Rechts nach links"
 
@@ -2389,39 +2614,43 @@ msgstr "Suchbegriff:"
 msgid "Results for:"
 msgstr "Ergebnisse für:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Herausgabedatum von"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Herausgabedatum bis"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr "Lesestatus"
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Tags ausschließen"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Serien ausschließen"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Sprachen ausschließen"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Erweiterungen ausschließen"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Bewertungen größer als"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Bewertungen kleiner als"
 
@@ -2430,18 +2659,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 "Bücherregal Eigenschaften bearbeiten"
 
-#: 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 "Bücher manuell sortieren"
 
-#: cps/templates/shelf.html:67
-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 "Manuelles Sortieren deaktivieren"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr "Manuelles Sortieren aktivieren"
+
+#: 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"
 
@@ -2453,6 +2686,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"
@@ -2474,8 +2711,8 @@ msgid "Series in this Library"
 msgstr "Serien in dieser Bibliothek"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Dynamische Bibliotheken"
+msgid "System Statistics"
+msgstr "System Statistiken"
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2553,19 +2790,10 @@ 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:146
-msgid "Recent Downloads"
-msgstr "Letzte Downloads"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Kobo Auth URL erzeugen"
-
-#: cps/templates/user_edit.html:178
-msgid "Do you really want to delete the Kobo Token?"
-msgstr "Möchten Sie wirklich den Kobo Token löschen?"
-
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..3f6d471d
Binary files /dev/null and b/cps/translations/el/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..4b755d1e
--- /dev/null
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -0,0 +1,2798 @@
+# Greek Translations for Calibre-Web.
+# Copyright (C) 2020 Ozzie Isaacs
+# This file is distributed under the same license as the Calibre-Web project.
+# Depountis Georgios 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Depountis Georgios\n"
+"Language: el\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
+
+#: cps/about.py:42
+msgid "installed"
+msgstr "εγκαταστάθηκε"
+
+#: cps/about.py:44 cps/converter.py:32
+msgid "not installed"
+msgstr "δεν εγκαταστάθηκε"
+
+#: cps/about.py:99
+msgid "Statistics"
+msgstr "Στατιστικά"
+
+#: cps/admin.py:147
+msgid "Server restarted, please reload page"
+msgstr "Ο διακομιστής επανεκκίνησε, παρακαλούμε φόρτωσε ξανά τη σελίδα"
+
+#: cps/admin.py:149
+msgid "Performing shutdown of server, please close window"
+msgstr "Πραγματοποιείται κλείσιμο του διακομιστή, παρακαλούμε κλείσε το παράθυρο"
+
+#: cps/admin.py:157
+msgid "Reconnect successful"
+msgstr "Επιτυχής επανασύνδεση"
+
+#: cps/admin.py:160
+msgid "Unknown command"
+msgstr "Άγνωστη εντολή"
+
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
+msgid "Unknown"
+msgstr "ʼΑγνωστο"
+
+#: cps/admin.py:191
+msgid "Admin page"
+msgstr "Σελίδα διαχειριστή"
+
+#: cps/admin.py:213
+msgid "UI Configuration"
+msgstr "UI Διαμόρφωση"
+
+#: cps/admin.py:245 cps/admin.py:923
+msgid "Calibre-Web configuration updated"
+msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
+
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Θέλεις πραγματικά να διαγράψεις τη Μονάδα Kobo;"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
+msgid "Deny"
+msgstr "Απόρριψη"
+
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
+msgid "Allow"
+msgstr "Επιτρέπεται"
+
+#: cps/admin.py:679
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
+
+#: cps/admin.py:721
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
+
+#: cps/admin.py:727
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
+
+#: cps/admin.py:757
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
+
+#: cps/admin.py:772
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
+
+#: cps/admin.py:775
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
+
+#: cps/admin.py:780
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
+
+#: cps/admin.py:783
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
+
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
+
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:834
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
+msgid "Settings DB is not Writeable"
+msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
+
+#: cps/admin.py:916
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:920
+msgid "DB is not Writeable"
+msgstr "Η DB δεν μπορεί να Γραφτεί"
+
+#: cps/admin.py:959
+msgid "Basic Configuration"
+msgstr "Βασική Διαμόρφωση"
+
+#: cps/admin.py:974 cps/web.py:1279
+msgid "Please fill out all fields!"
+msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
+
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
+msgid "Add new user"
+msgstr "Προσθήκη νέου χρήστη"
+
+#: cps/admin.py:986 cps/web.py:1449
+msgid "E-mail is not from valid domain"
+msgstr "Το E-mail δεν είναι από έγκυρο domain"
+
+#: cps/admin.py:993 cps/admin.py:1008
+msgid "Found an existing account for this e-mail address or nickname."
+msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
+
+#: cps/admin.py:1004
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
+
+#: cps/admin.py:1020
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
+
+#: cps/admin.py:1023
+msgid "No admin user remaining, can't delete user"
+msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
+
+#: cps/admin.py:1028
+msgid "No admin user remaining, can't remove admin role"
+msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
+
+#: cps/admin.py:1064 cps/web.py:1491
+msgid "Found an existing account for this e-mail address."
+msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
+
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Επεξεργασία χρήστη %(nick)s"
+
+#: cps/admin.py:1079 cps/web.py:1460
+msgid "This username is already taken"
+msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
+
+#: cps/admin.py:1094
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
+
+#: cps/admin.py:1097
+msgid "An unknown error occured."
+msgstr "Προέκυψε ένα άγνωστο σφάλμα."
+
+#: cps/admin.py:1127 cps/templates/admin.html:78
+msgid "Edit E-mail Server Settings"
+msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
+
+#: cps/admin.py:1156
+#, python-format
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr "Το e-mail δοκιμής στάλθηκε επιτυχώς στο %(kindlemail)s"
+
+#: cps/admin.py:1159
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
+
+#: cps/admin.py:1161
+msgid "Please configure your e-mail address first..."
+msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
+
+#: cps/admin.py:1163
+msgid "E-mail server settings updated"
+msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
+
+#: cps/admin.py:1174
+msgid "User not found"
+msgstr "Δεν βρέθηκε χρήστης"
+
+#: cps/admin.py:1201
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
+
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
+msgid "An unknown error occurred. Please try again later."
+msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
+
+#: cps/admin.py:1207 cps/web.py:1241
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
+
+#: cps/admin.py:1218
+msgid "Logfile viewer"
+msgstr "Προβολέας αρχείου φύλλου καταγραφής"
+
+#: cps/admin.py:1280
+msgid "Requesting update package"
+msgstr "Αίτημα πακέτου ενημέρωσης"
+
+#: cps/admin.py:1281
+msgid "Downloading update package"
+msgstr "Κατεβάζει πακέτο ενημέρωσης"
+
+#: cps/admin.py:1282
+msgid "Unzipping update package"
+msgstr "Ανοίγει πακέτο ενημέρωσης"
+
+#: cps/admin.py:1283
+msgid "Replacing files"
+msgstr "Αντικατάσταση αρχείων"
+
+#: cps/admin.py:1284
+msgid "Database connections are closed"
+msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
+
+#: cps/admin.py:1285
+msgid "Stopping server"
+msgstr "Σταματάει το διακομιστή"
+
+#: cps/admin.py:1286
+msgid "Update finished, please press okay and reload page"
+msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
+
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
+msgid "Update failed:"
+msgstr "Η ενημέρωση απέτυχε:"
+
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+msgid "HTTP Error"
+msgstr "HTTP Σφάλμα"
+
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
+msgid "Connection error"
+msgstr "Σφάλμα σύνδεσης"
+
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
+msgid "Timeout while establishing connection"
+msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
+
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
+msgid "General error"
+msgstr "Γενικό σφάλμα"
+
+#: cps/admin.py:1291
+msgid "Update File Could Not be Saved in Temp Dir"
+msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
+
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Σφάλμα: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
+msgid "not configured"
+msgstr "δεν διαμορφώθηκε"
+
+#: cps/converter.py:33
+msgid "Execution permissions missing"
+msgstr "Λείπουν άδειες εκτέλεσης"
+
+#: cps/editbooks.py:297 cps/editbooks.py:299
+msgid "Book Format Successfully Deleted"
+msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
+
+#: cps/editbooks.py:306 cps/editbooks.py:308
+msgid "Book Successfully Deleted"
+msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
+
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
+msgid "Error opening eBook. File does not exist or file is not accessible"
+msgstr "Σφάλμα ανοίγματος eBook. Το αρχείο δεν υπάρχει ή το αρχείο δεν είναι προσβάσιμο"
+
+#: cps/editbooks.py:350
+msgid "edit metadata"
+msgstr "επεξεργασία μεταδεδομένων"
+
+#: cps/editbooks.py:425
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
+
+#: cps/editbooks.py:536 cps/editbooks.py:802
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
+
+#: cps/editbooks.py:540 cps/editbooks.py:806
+msgid "File to be uploaded must have an extension"
+msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
+
+#: cps/editbooks.py:552
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
+
+#: cps/editbooks.py:557
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
+
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
+
+#: cps/editbooks.py:579
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
+
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
+
+#: cps/editbooks.py:743
+msgid "Metadata successfully updated"
+msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
+
+#: cps/editbooks.py:752
+msgid "Error editing book, please check logfile for details"
+msgstr "Σφάλμα επεξεργασίας βιβλίου, παρακαλούμε έλεγξε το φύλλο καταγραφής για λεπτομέρειες"
+
+#: cps/editbooks.py:814
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
+
+#: cps/editbooks.py:824
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
+
+#: cps/editbooks.py:912
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
+
+#: cps/editbooks.py:923
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "Το αρχείο %(file)s ανέβηκε"
+
+#: cps/editbooks.py:949
+msgid "Source or destination format for conversion missing"
+msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
+
+#: cps/editbooks.py:957
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
+
+#: cps/editbooks.py:961
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
+
+#: cps/gdrive.py:60
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, προσπάθησε να απενεργοποιήσεις και να ενεργοποιήσεις ξανά το Google Drive"
+
+#: cps/gdrive.py:97
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Η ανάκληση ονόματος δεν έχει επαληθευτεί, παρακαλούμε ακολούθησε τα βήματα για την επαλήθευση ονόματος στην κονσόλα προγραμματιστή google"
+
+#: cps/helper.py:80
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s η δομή δεν βρέθηκε για την ταυτότητα βιβλίου: %(book)d"
+
+#: cps/helper.py:86 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:91
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s δεν βρέθηκε: %(fn)s"
+
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Αποστολή στο Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Αυτό το e-mail έχει σταλεί μέσω Calibre-Web."
+
+#: cps/helper.py:111
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web δοκιμαστικό e-mail"
+
+#: cps/helper.py:112
+msgid "Test e-mail"
+msgstr "Δοκιμαστικό e-mail"
+
+#: cps/helper.py:129
+msgid "Get Started with Calibre-Web"
+msgstr "Ξεκινήστε με το Calibre-Web"
+
+#: cps/helper.py:134
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "e-mail εγγραφής για χρήστη: %(name)s"
+
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "Αποστολή %(format)s στο Kindle"
+
+#: cps/helper.py:184 cps/helper.py:190
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "Μετατροπή %(orig)s σε %(format)s και αποστολή στο Kindle"
+
+#: cps/helper.py:231
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "E-mail: %(book)s"
+
+#: cps/helper.py:233
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Το αρχείου που χητήθηκε δεν μπορεί να διαβαστεί. Μπορεί να υπάρχουν λαθασμένες άδειες;"
+
+#: cps/helper.py:330
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "Η διαγραφή φακέλου βιβλίου για το βιβλίο %(id)s απέτυχε, η πορεία έχει υπό-φακέλους: %(path)s"
+
+#: cps/helper.py:336
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "Η διαγραφή βιβλίου %(id)s απέτυχε: %(message)s"
+
+#: cps/helper.py:346
+#, python-format
+msgid "Deleting book %(id)s, book path not valid: %(path)s"
+msgstr "Διαγραφή βιβλίου %(id)s, η πορεία βιβλίου δεν είναι έγκυρη: %(path)s"
+
+#: cps/helper.py:401
+#, 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:416
+#, 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:441 cps/helper.py:451 cps/helper.py:459
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
+
+#: cps/helper.py:480
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
+
+#: cps/helper.py:588
+msgid "Error Downloading Cover"
+msgstr "Σφάλμα Κατεβάσματος Φόντου"
+
+#: cps/helper.py:591
+msgid "Cover Format Error"
+msgstr "Σφάλμα Μορφής Φόντου"
+
+#: cps/helper.py:605
+msgid "Failed to create path for cover"
+msgstr "Αποτυχία δημιουργίας πορείας για φόντο"
+
+#: cps/helper.py:610
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "Το αρχείο φόντου δεν είναι ένα έγκυρο αρχείο εικόνας, ή δεν μπόρεσε να αποθηκευτεί"
+
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
+
+#: cps/helper.py:634
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "Μόνο jpg/jpeg αρχεία υποστηρίζονται ως αρχεία φόντου"
+
+#: cps/helper.py:685
+msgid "Unrar binary file not found"
+msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
+
+#: cps/helper.py:699
+msgid "Error excecuting UnRar"
+msgstr "Σφάλμα εκτέλεσης UnRar"
+
+#: cps/helper.py:748
+msgid "Waiting"
+msgstr "Αναμονή"
+
+#: cps/helper.py:750
+msgid "Failed"
+msgstr "Απέτυχε"
+
+#: cps/helper.py:752
+msgid "Started"
+msgstr "Ξεκίνησε"
+
+#: cps/helper.py:754
+msgid "Finished"
+msgstr "Τελείωσε"
+
+#: cps/helper.py:756
+msgid "Unknown Status"
+msgstr "ʼΑγνωστη κατάσταση"
+
+#: cps/kobo_auth.py:130
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr "Παρακαλούμε λάβε πρόσβαση στο calibre-web από ένα μη τοπικό εξηπηρετητή για να λάβεις μια έγκυρη api_endpoint για συσκευή kobo"
+
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
+msgid "Kobo Setup"
+msgstr "Καθορισμός Kobo"
+
+#: cps/oauth_bb.py:73
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "Εγγραφή με %(provider)s"
+
+#: cps/oauth_bb.py:146
+msgid "Failed to log in with GitHub."
+msgstr "Αποτυχία σύνδεσης με GitHub."
+
+#: cps/oauth_bb.py:151
+msgid "Failed to fetch user info from GitHub."
+msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το GitHub."
+
+#: cps/oauth_bb.py:162
+msgid "Failed to log in with Google."
+msgstr "Αποτυχία σύνδεσης με το Google."
+
+#: cps/oauth_bb.py:167
+msgid "Failed to fetch user info from Google."
+msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το Google."
+
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
+
+#: cps/oauth_bb.py:223
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "Η Σύνδεση στο %(oauth)s Πέτυχε"
+
+#: cps/oauth_bb.py:229
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "Η σύνδεση απέτυχε, Δεν Υπάρχει Συνδεδεμένος Χρήστης Με Λογαριασμό OAuth"
+
+#: cps/oauth_bb.py:271
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Πέτυχε"
+
+#: cps/oauth_bb.py:275
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Απέτυχε"
+
+#: cps/oauth_bb.py:278
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "Δεν Είναι Συνδεδεμένο με το %(oauth)s"
+
+#: cps/oauth_bb.py:306
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
+
+#: cps/oauth_bb.py:325
+msgid "Google Oauth error, please retry later."
+msgstr "Google Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
+
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "σύνδεση"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Η μάρκα δεν βρέθηκε"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Η μάρκα έχει λήξει"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr "Αρχειοθετημένα Βιβλία"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Προβολή αρχειοθετημένων βιβλίων"
+
+#: cps/render_template.py:91 cps/web.py:735
+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: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:85
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Το βιβλίο είναι ήδη μέρος αυτού του ραφιού: %(shelfname)s"
+
+#: cps/shelf.py:108
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Το βιβλίο έχει προστεθεί στο ράφι: %(sname)s"
+
+#: 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:144
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Τα βιβλία είναι ήδη μέρος του ραφιού: %(name)s"
+
+#: cps/shelf.py:156
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Βιβλία είχαν προστεθεί στο ραφι: %(sname)s"
+
+#: cps/shelf.py:161
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Δεν μπόρεσε να γίνει η προσθήκη βιβλίων στο ράφι: %(sname)s"
+
+#: cps/shelf.py:206
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sname)s"
+
+#: 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Δημιούργησε ένα Ράφι"
+
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Επεξεργασία ενός ραφιού"
+
+#: cps/shelf.py:249
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Το ράφι %(title)s δημιουργήθηκε"
+
+#: cps/shelf.py:252
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Το ράφι %(title)s άλλαξε"
+
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Υπήρξε ένα σφάλμα"
+
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:358
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
+
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Ράφι: '%(name)s"
+
+#: cps/shelf.py:427
+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"
+msgstr "Απρόβλεπτα δεδομένα κατά την ανάγνωση των πληροφοριών ενημέρωσης"
+
+#: cps/updater.py:302 cps/updater.py:413
+msgid "No update available. You already have the latest version installed"
+msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση. Έχεις ήδη την τελευταία έκδοση εγκατεστημένη"
+
+#: cps/updater.py:334
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία έκδοση."
+
+#: cps/updater.py:386
+msgid "Could not fetch update information"
+msgstr "Δεν μπόρεσε να συγκεντρώσει τις πληροφορίες ενημέρωσης"
+
+#: cps/updater.py:400
+msgid "No release information available"
+msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
+
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε κλικ στο κουμπί πιο κάτω για ενημέρωση με την έκδοση: %(version)s"
+
+#: cps/updater.py:478
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία σταθερή έκδοση."
+
+#: cps/templates/index.html:5 cps/web.py:385
+msgid "Discover (Random Books)"
+msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
+
+#: cps/web.py:449
+msgid "Hot Books (Most Downloaded)"
+msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
+
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Κατεβασμένα βιβλία από %(user)s"
+
+#: cps/web.py:498
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
+
+#: cps/web.py:512
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Συγγραφέας: %(name)s"
+
+#: cps/web.py:526
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Εκδότης: %(name)s"
+
+#: cps/web.py:539
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Σειρές: %(serie)s"
+
+#: cps/web.py:552
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Αξιολόγηση: %(rating)s stars"
+
+#: cps/web.py:565
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Μορφή αρχείου: %(format)s"
+
+#: cps/web.py:579
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Κατηγορία: %(name)s"
+
+#: cps/web.py:598
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Γλώσσα: %(name)s"
+
+#: cps/web.py:628
+#, 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:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Προχωρημένη Αναζήτηση"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Λίστα αξιολογήσεων"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Λίστα μορφών αρχείου"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Εκδόθηκε μετά"
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Εκδόθηκε πριν"
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Αξιολόγηση <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Αξιολόγηση >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
+
+#: cps/web.py:1250
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
+
+#: cps/web.py:1252
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
+
+#: cps/web.py:1269
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
+
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
+msgid "register"
+msgstr "εγγραφή"
+
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
+msgid "Your e-mail is not allowed to register"
+msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
+
+#: cps/web.py:1315
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
+
+#: cps/web.py:1318
+msgid "This username or e-mail address is already in use."
+msgstr "Αυτό το όνομα χρήστη ή η διεύθυνση e-mail είναι ήδη σε χρήση."
+
+#: cps/web.py:1335
+msgid "Cannot activate LDAP authentication"
+msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
+
+#: cps/web.py:1352
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
+
+#: cps/web.py:1358
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
+
+#: cps/web.py:1362 cps/web.py:1386
+msgid "Wrong Username or Password"
+msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
+
+#: cps/web.py:1369
+msgid "New Password was send to your email address"
+msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
+
+#: cps/web.py:1375
+msgid "Please enter valid username to reset password"
+msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
+
+#: cps/web.py:1381
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
+
+#: cps/web.py:1451 cps/web.py:1504
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s's προφίλ"
+
+#: cps/web.py:1487
+msgid "Profile updated"
+msgstr "Το προφίλ ενημερώθηκε"
+
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
+msgid "Read a Book"
+msgstr "Διάβασε ένα Βιβλίο"
+
+#: cps/tasks/convert.py:114
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Το εργαλείο μετατροπής Calibre ebook %(tool)s δεν βρέθηκε"
+
+#: cps/tasks/convert.py:138
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s μορφή δεν βρέθηκε σε δίσκο"
+
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr "Ο μετατροπέας Ebook απέτυχε με άγνωστο σφάλμα"
+
+#: cps/tasks/convert.py:152
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Ο μετατροπέας Kepubify απέτυχε: %(error)s"
+
+#: cps/tasks/convert.py:176
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υπάρχουν περισσότερα από ένα αρχεία στο φάκελο %(folder)s"
+
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "Χρήστες"
+
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:8
+#: cps/templates/user_edit.html:9
+msgid "Username"
+msgstr "Όνομα Χρήστη"
+
+#: cps/templates/admin.html:13 cps/templates/register.html:13
+#: cps/templates/user_edit.html:14
+msgid "E-mail Address"
+msgstr "Διεύθυνση E-mail"
+
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:27
+msgid "Send to Kindle E-mail Address"
+msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
+
+#: cps/templates/admin.html:15
+msgid "Downloads"
+msgstr "Κατεβασμένα"
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:77
+msgid "Admin"
+msgstr "Διαχειριστής"
+
+#: cps/templates/admin.html:17 cps/templates/login.html:12
+#: cps/templates/login.html:13 cps/templates/user_edit.html:22
+msgid "Password"
+msgstr "Κωδικός"
+
+#: cps/templates/admin.html:18 cps/templates/layout.html:66
+msgid "Upload"
+msgstr "Ανέβασμα"
+
+#: cps/templates/admin.html:19 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+msgid "Download"
+msgstr "Κατέβασμα"
+
+#: cps/templates/admin.html:20
+msgid "View Books"
+msgstr "Προβολή Βιβλίων"
+
+#: cps/templates/admin.html:21
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: cps/templates/admin.html:22 cps/templates/book_edit.html:16
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: cps/templates/admin.html:23
+msgid "Public Shelf"
+msgstr "Δημόσιο Ράφι"
+
+#: cps/templates/admin.html:44
+msgid "Add New User"
+msgstr "Προσθήκη Νέου Χρήστη"
+
+#: cps/templates/admin.html:46
+msgid "Import LDAP Users"
+msgstr "Εισαγωγή Χρηστών LDAP"
+
+#: cps/templates/admin.html:53
+msgid "E-mail Server Settings"
+msgstr "Ρυθμίσεις E-mail Διακομιστή"
+
+#: cps/templates/admin.html:57 cps/templates/email_edit.html:11
+msgid "SMTP Hostname"
+msgstr "Όνομα Εξυπηρετητή SMTP"
+
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
+msgid "SMTP Port"
+msgstr "SMTP Θύρα"
+
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
+msgid "Encryption"
+msgstr "Κρυπτογράφηση"
+
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
+msgid "SMTP Login"
+msgstr "Σύνδεση SMTP"
+
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
+msgid "From E-mail"
+msgstr "Από E-mail"
+
+#: cps/templates/admin.html:84
+msgid "Configuration"
+msgstr "Διαμόρφωση"
+
+#: cps/templates/admin.html:87
+msgid "Calibre Database Directory"
+msgstr "Ευρετήριο Βάσης Δεδομένων Calibre"
+
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
+msgid "Log Level"
+msgstr "Επίπεδο Φύλλου Καταγραφής"
+
+#: cps/templates/admin.html:95
+msgid "Port"
+msgstr "Θύρα"
+
+#: cps/templates/admin.html:100
+msgid "External Port"
+msgstr "Εξωτερική Θύρα"
+
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
+msgstr "Βιβλία ανά Σελίδα"
+
+#: cps/templates/admin.html:111
+msgid "Uploads"
+msgstr "Ανεβάσμένα"
+
+#: cps/templates/admin.html:115
+msgid "Anonymous Browsing"
+msgstr "Ανώνυμη Περιήγηση"
+
+#: cps/templates/admin.html:119
+msgid "Public Registration"
+msgstr "Δημόσια Εγγραφή"
+
+#: cps/templates/admin.html:123
+msgid "Magic Link Remote Login"
+msgstr "Μαγικός Σύνδεσμος Απομακρυσμένης Σύνδεσης"
+
+#: cps/templates/admin.html:127
+msgid "Reverse Proxy Login"
+msgstr "Αναστροφή Σύνδεσης Διακομιστή Μεσολάβησης"
+
+#: cps/templates/admin.html:132
+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"
+
+#: cps/templates/admin.html:143
+msgid "Administration"
+msgstr "Διοίκηση"
+
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
+msgid "View Logs"
+msgstr "Προβολή Φύλλων Καταγραφής"
+
+#: cps/templates/admin.html:148
+msgid "Reconnect Calibre Database"
+msgstr "Επανασύνδεση Βάσης Δεδομένων Calibre"
+
+#: cps/templates/admin.html:149
+msgid "Restart"
+msgstr "Επανεκκίνηση"
+
+#: cps/templates/admin.html:150
+msgid "Shutdown"
+msgstr "Κλείσιμο"
+
+#: cps/templates/admin.html:155
+msgid "Update"
+msgstr "Ενημέρωση"
+
+#: cps/templates/admin.html:159
+msgid "Version"
+msgstr "Έκδοση"
+
+#: cps/templates/admin.html:160
+msgid "Details"
+msgstr "Λεπτομέρειες"
+
+#: cps/templates/admin.html:166
+msgid "Current version"
+msgstr "Τρέχουσα έκδοση"
+
+#: cps/templates/admin.html:172
+msgid "Check for Update"
+msgstr "Έλεγχος για Ενημέρωση"
+
+#: cps/templates/admin.html:173
+msgid "Perform Update"
+msgstr "Πραγματοποίηση Ενημέρωσης"
+
+#: cps/templates/admin.html:185
+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: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: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 "Ακύρωση"
+
+#: cps/templates/admin.html:203
+msgid "Are you sure you want to shutdown?"
+msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
+
+#: cps/templates/admin.html:215
+msgid "Updating, please do not reload this page"
+msgstr "Γίνεται ενημέρωση, παρακαλούμε μη φορτώσεις ξανά αυτή τη σελίδα"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "μέσω"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "Στη Βιβλιοθήκη"
+
+#: cps/templates/author.html: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: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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:101
+msgid "More by"
+msgstr "Περισσότερα από"
+
+#: cps/templates/book_edit.html:10
+msgid "Delete Book"
+msgstr "Διαγραφή Βιβλίου"
+
+#: cps/templates/book_edit.html:13
+msgid "Delete formats:"
+msgstr "Διαγραφή μορφών:"
+
+#: cps/templates/book_edit.html:24
+msgid "Convert book format:"
+msgstr "Μετατροπή μορφής βιβλίου:"
+
+#: cps/templates/book_edit.html:28
+msgid "Convert from:"
+msgstr "Μετατροπή από:"
+
+#: cps/templates/book_edit.html:30 cps/templates/book_edit.html:37
+msgid "select an option"
+msgstr "διάλεξε μια επιλογή"
+
+#: cps/templates/book_edit.html:35
+msgid "Convert to:"
+msgstr "Μετατροπή σε:"
+
+#: cps/templates/book_edit.html:44
+msgid "Convert book"
+msgstr "Μετατροπή βιβλίου"
+
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
+msgid "Book Title"
+msgstr "Τίτλος Βιβλίου"
+
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html: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:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: cps/templates/book_edit.html:66
+msgid "Identifiers"
+msgstr "Αναγνωριστικά"
+
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
+msgid "Identifier Type"
+msgstr "Είδος Αναγνωριστικού"
+
+#: 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:289
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: cps/templates/book_edit.html:76
+msgid "Add Identifier"
+msgstr "Προσθήκη Αναγνωριστικού"
+
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
+msgid "Tags"
+msgstr "Ετικέτες"
+
+#: cps/templates/book_edit.html:88
+msgid "Series ID"
+msgstr "Ταυτότητα Σειράς"
+
+#: cps/templates/book_edit.html:92
+msgid "Rating"
+msgstr "Αξιολόγηση"
+
+#: cps/templates/book_edit.html:98
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "Συγκέντρωση Εξώφυλλου από URL (JPEG - Η εικόνα θα κατέβει και θα αποθηκευτεί σε βάση δεδομένων)"
+
+#: cps/templates/book_edit.html:102
+msgid "Upload Cover from Local Disk"
+msgstr "Ανέβασμα Εξώφυλλου από Τοπικό Δίσκο"
+
+#: cps/templates/book_edit.html:109
+msgid "Published Date"
+msgstr "Ημερομηνία Έκδοσης"
+
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
+msgid "Publisher"
+msgstr "Εκδότης"
+
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:32
+msgid "Language"
+msgstr "Γλώσσα"
+
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
+msgid "Yes"
+msgstr "Ναι"
+
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
+msgid "No"
+msgstr "Όχι"
+
+#: cps/templates/book_edit.html:178
+msgid "Upload Format"
+msgstr "Μορφή Ανεβάσματος"
+
+#: cps/templates/book_edit.html:187
+msgid "View Book on Save"
+msgstr "Προβολή Βιβλίου σε Αποθήκευση"
+
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
+msgid "Fetch Metadata"
+msgstr "Συγκέντρωση Μεταδεδομένων"
+
+#: 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/shelf_order.html:40
+#: cps/templates/user_edit.html:130
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: cps/templates/book_edit.html:211
+msgid "Keyword"
+msgstr "Λέξη κλειδί"
+
+#: cps/templates/book_edit.html:212
+msgid " Search keyword "
+msgstr "Αναζήτηση λέξης κλειδιού"
+
+#: cps/templates/book_edit.html:218
+msgid "Click the cover to load metadata to the form"
+msgstr "Κάνε κλικ στο εξώφυλλο για φόρτωση μεταδεδομένων στη φόρμα"
+
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
+msgid "Loading..."
+msgstr "Φόρτωση..."
+
+#: 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:265 cps/templates/book_edit.html:279
+msgid "Source"
+msgstr "Πηγή"
+
+#: cps/templates/book_edit.html:274
+msgid "Search error!"
+msgstr "Σφάλμα αναζήτησης!"
+
+#: cps/templates/book_edit.html:275
+msgid "No Result(s) found! Please try another keyword."
+msgstr "Δεν βρέθηκε(αν) αποτέλεσμα(τα)! Παρακαλούμε δοκίμασε μια άλλη λέξη κλειδί."
+
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "Αυτό το Πεδίο Απαιτείται"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "Συγχώνευση επιλεγμένων βιβλίων"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "Αφαίρεση Επιλογών"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "Ενημέρωση Ταξινόμησης Τίτλων αυτόματα"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "Ενημέρωση Ταξινίμησης Συγγραφέα αυτόματα"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "Εισαγωγή Τίτλου"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Τίτλος"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr "Εισαγωγή Ταξινόμησης Τίτλου"
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr "Ταξινόμηση Τίτλου"
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr "Εισαγωγή Ταξινόμησης Συγγραφέας"
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr "Ταξινόμηση Συγγραφέα"
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr "Εισαγωγή Συγγραφέων"
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr "Εισαγωγή Κατηγοριών"
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr "Εισαγωγή Σειρών"
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr "Εισαγωγή τίτλου"
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr "Ευρετήριο Σειρών"
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr "Εισαγωγή Γλωσσών"
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr "Ημερομηνία Έκδοσης"
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr "Εισαγωγή Εκδοτών"
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Είσαι πραγματικά σίγουρος/η;"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr "Βιβλία με Τίτλους θα ενωθούν από:"
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr "Μέσα σε Βιβλίο με Τίτλο:"
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "Συγχώνευση"
+
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr "Διαμόρφωση Βιβλιοθήκης"
+
+#: cps/templates/config_edit.html:18
+msgid "Location of Calibre Database"
+msgstr "Τοποθεσία Βάσης Δεδομένων Calibre"
+
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f option"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
+msgid "Use Google Drive?"
+msgstr "Χρήση Google Drive;"
+
+#: cps/templates/config_edit.html:41
+msgid "Google Drive config problem"
+msgstr "Google Drive πρόβλημα διαμόρφωσης"
+
+#: cps/templates/config_edit.html:47
+msgid "Authenticate Google Drive"
+msgstr "Πιστοποίηση αυθεντικότητας Google Drive"
+
+#: cps/templates/config_edit.html:51
+msgid "Please hit save to continue with setup"
+msgstr "Παρακαλούμε επέλεξε αποθήκευση για να συνεχίσεις με τον καθορισμό"
+
+#: cps/templates/config_edit.html:54
+msgid "Please finish Google Drive setup after login"
+msgstr "Παρακαλούμε ολοκλήρωσε τον καθορισμό του Google Drive μετά τη σύνδεση"
+
+#: cps/templates/config_edit.html:59
+msgid "Google Drive Calibre folder"
+msgstr "Αρχείο Google Drive Calibre"
+
+#: cps/templates/config_edit.html:67
+msgid "Metadata Watch Channel ID"
+msgstr "Ταυτότητα Καναλιού Προβολής Μεταδεδομένων"
+
+#: cps/templates/config_edit.html:70
+msgid "Revoke"
+msgstr "Αναίρεση"
+
+#: cps/templates/config_edit.html:90
+msgid "Server Configuration"
+msgstr "Διαμόρφωση Διακομιστή"
+
+#: cps/templates/config_edit.html:97
+msgid "Server Port"
+msgstr "Θύρα Διακομιστή"
+
+#: 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:107
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "Τοποθεσία αρχείου κλειδιού SSL (αφήστε το κενό για Διακομιστές που δεν είναι SSL)"
+
+#: cps/templates/config_edit.html:115
+msgid "Update Channel"
+msgstr "Ενημέρωση Καναλιού"
+
+#: cps/templates/config_edit.html:117
+msgid "Stable"
+msgstr "Σταθερό"
+
+#: cps/templates/config_edit.html:118
+msgid "Nightly"
+msgstr "Νυχτερινό"
+
+#: cps/templates/config_edit.html:129
+msgid "Logfile Configuration"
+msgstr "Διαμόρφωση αρχείου καταγραφής"
+
+#: 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:150
+msgid "Enable Access Log"
+msgstr "Ενεργοποίηση Πρόσβασης Φύλλου Καταγραφής"
+
+#: 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:164
+msgid "Feature Configuration"
+msgstr "Διαμόρφωση Λειτουργίας"
+
+#: cps/templates/config_edit.html:172
+msgid "Enable Uploads"
+msgstr "Ενεργοποίηση Ανεβάσματος"
+
+#: cps/templates/config_edit.html:176
+msgid "Allowed Upload Fileformats"
+msgstr "Επιτρεπόμενες Μορφές Αρχείων για Ανέβασμα"
+
+#: cps/templates/config_edit.html:182
+msgid "Enable Anonymous Browsing"
+msgstr "Ενεργοποίηση Ανώνυμης Περιήγησης"
+
+#: cps/templates/config_edit.html:186
+msgid "Enable Public Registration"
+msgstr "Ενεργοποίηση Δημόσιας Εγγραφής"
+
+#: cps/templates/config_edit.html:191
+msgid "Use E-Mail as Username"
+msgstr "Χρήση E-Mail ως Όνομα Χρήστη"
+
+#: cps/templates/config_edit.html:196
+msgid "Enable Magic Link Remote Login"
+msgstr "Ενεργοποίηση Μαγικού Συνδέσμου Απομακρυσμένης Σύνδεσης"
+
+#: cps/templates/config_edit.html:201
+msgid "Enable Kobo sync"
+msgstr "Ενεργοποίηση συγχρονισμού Kobo"
+
+#: cps/templates/config_edit.html:206
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Proxy άγνωστα αιτήματα στο Κατάστημα Kobo"
+
+#: cps/templates/config_edit.html:209
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "Εξωτερική Θύρα Διακομιστή (για κλήσεις API προωθημένες στη θύρα)"
+
+#: cps/templates/config_edit.html:217
+msgid "Use Goodreads"
+msgstr "Χρήση Goodreads"
+
+#: cps/templates/config_edit.html:218
+msgid "Create an API Key"
+msgstr "Δημιουργία ενός Κλειδιού API"
+
+#: cps/templates/config_edit.html:222
+msgid "Goodreads API Key"
+msgstr "Goodreads Κλειδί API"
+
+#: cps/templates/config_edit.html:226
+msgid "Goodreads API Secret"
+msgstr "Goodreads Μυστικό API"
+
+#: cps/templates/config_edit.html:233
+msgid "Allow Reverse Proxy Authentication"
+msgstr "Να Επιτραπεί η Αναστροφή Επαλήθευσης Proxy"
+
+#: cps/templates/config_edit.html:237
+msgid "Reverse Proxy Header Name"
+msgstr "Αναστροφή Proxy Όνομα Επικεφαλίδας"
+
+#: cps/templates/config_edit.html:244
+msgid "Login type"
+msgstr "Είδος σύνδεσης"
+
+#: cps/templates/config_edit.html:246
+msgid "Use Standard Authentication"
+msgstr "Χρήση Στεθερής Επαλήθευσης"
+
+#: cps/templates/config_edit.html:248
+msgid "Use LDAP Authentication"
+msgstr "Χρήση Επαλήθευσης LDAP"
+
+#: cps/templates/config_edit.html:251
+msgid "Use OAuth"
+msgstr "Χρήση OAuth"
+
+#: cps/templates/config_edit.html:258
+msgid "LDAP Server Host Name or IP Address"
+msgstr "Όνομα Διακομιστή Φιλοξενίας LDAP ή Διεύθυνση IP"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server Port"
+msgstr "Θύρα Διακομιστή LDAP"
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Encryption"
+msgstr "LDAP Αποκρυπτογράφηση"
+
+#: 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:269
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:270
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
+msgid "LDAP Authentication"
+msgstr "LDAP Επαλήθευση"
+
+#: cps/templates/config_edit.html:299
+msgid "Anonymous"
+msgstr "Ανώνυμοι"
+
+#: cps/templates/config_edit.html:300
+msgid "Unauthenticated"
+msgstr "Μη επαληθεύσιμο"
+
+#: cps/templates/config_edit.html:301
+msgid "Simple"
+msgstr "Απλό"
+
+#: cps/templates/config_edit.html:306
+msgid "LDAP Administrator Username"
+msgstr "LDAP Όνομα Χρήστη Διαχειριστή"
+
+#: cps/templates/config_edit.html:312
+msgid "LDAP Administrator Password"
+msgstr "LDAP Κωδικός Διαχειριστή"
+
+#: cps/templates/config_edit.html:317
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP Χαρακτηριστικό Όνομα (ΧΟ)"
+
+#: cps/templates/config_edit.html:321
+msgid "LDAP User Object Filter"
+msgstr "LDAP Αντικείμενο Φίλτρου Χρήστη"
+
+#: cps/templates/config_edit.html:326
+msgid "LDAP Server is OpenLDAP?"
+msgstr "Είναι ο Διακομιστής LDAP OpenLDAP;"
+
+#: cps/templates/config_edit.html:328
+msgid "Following Settings are Needed For User Import"
+msgstr "Χρειάζονται οι Ακόλουθες Ρυθμίσεις για Εισαγωγη Χρήστη"
+
+#: cps/templates/config_edit.html:330
+msgid "LDAP Group Object Filter"
+msgstr "Αντικείμενο Φίλτρου Ομάδας LDAP"
+
+#: cps/templates/config_edit.html:334
+msgid "LDAP Group Name"
+msgstr "LDAP Όνομα Ομάδας"
+
+#: cps/templates/config_edit.html:338
+msgid "LDAP Group Members Field"
+msgstr "LDAP Πεδίο Μελών Ομάδας"
+
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "Απόκτηση %(provider)s OAuth Διαπιστευτήρια"
+
+#: cps/templates/config_edit.html:364
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "%(provider)s OAuth Ταυτότητα Πελάτη"
+
+#: cps/templates/config_edit.html:368
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth Μυστικό Πελάτη"
+
+#: cps/templates/config_edit.html:384
+msgid "External binaries"
+msgstr "Εξωτερικοί Δυαδικοί"
+
+#: cps/templates/config_edit.html:390
+msgid "Path to Calibre E-Book Converter"
+msgstr "Πορεία για το Μετατροπέα Calibre E-Book"
+
+#: cps/templates/config_edit.html:398
+msgid "Calibre E-Book Converter Settings"
+msgstr "Calibre E-Book Ρυθμίσεις Μετατροπέα"
+
+#: cps/templates/config_edit.html:401
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Πορεία για Μετατροπέα Kepubify E-Book"
+
+#: cps/templates/config_edit.html:409
+msgid "Location of Unrar binary"
+msgstr "Τοποθεσία δυαδικού Unrar"
+
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:20
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: cps/templates/config_view_edit.html:16
+msgid "View Configuration"
+msgstr "Προβολή Διαμόρφωσης"
+
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
+msgstr "Αριθμός Τυχαίων Βιβλίων για Εμφάνιση"
+
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "Αριθμός Συγγραφέων για Εμφάνιση Πριν την Απόκρυψη (0=Απενεργοποίηση Απόκρυψης)"
+
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
+msgid "Theme"
+msgstr "Θέμα"
+
+#: cps/templates/config_view_edit.html:41
+msgid "Standard Theme"
+msgstr "Σταθερό Θέμα"
+
+#: cps/templates/config_view_edit.html:42
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! Σκοτεινό θέμα"
+
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
+msgstr "Συνήθης Έφραση για  για να Αγνοηθούν Στήλες"
+
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "Σύνδεση Κατάστασης Διαβασμένο/Αδιάβαστο σε Στήλη Calibre"
+
+#: cps/templates/config_view_edit.html:59
+msgid "View Restrictions based on Calibre column"
+msgstr "Προβολή Περιορισμών με βάση τη στήλη Calibre"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Συνήθης Έκφραση για Ταξινόμηση Τίτλου"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
+msgstr "Προκαθορισμένες Ρυθμίσεις για Νέους Χρήστες"
+
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:94
+msgid "Admin User"
+msgstr "Χρήστης Διαχειριστής"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:99
+msgid "Allow Downloads"
+msgstr "Να Επιτρέπεται το Κατέβασμα"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:103
+msgid "Allow eBook Viewer"
+msgstr "Να Επιτρέπεται η Προβολή eBook Viewer"
+
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:107
+msgid "Allow Uploads"
+msgstr "Να Επιτρέπεται το Ανέβασμα"
+
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:111
+msgid "Allow Edit"
+msgstr "Να Επιτρέπεται η Επεξεργασία"
+
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:115
+msgid "Allow Delete Books"
+msgstr "Να Επιτρέπεται η Διαγραφή Βιβλίων"
+
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:120
+msgid "Allow Changing Password"
+msgstr "Να Επιτρέπεται η Αλλαγή Κωδικού"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:124
+msgid "Allow Editing Public Shelves"
+msgstr "Να Επιτρέπεται η Επεξεργασία Δημόσιων Ραφιών"
+
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
+msgstr "Προκαθορισμένες Ορατότηες για Νέους Χρήστες"
+
+#: cps/templates/config_view_edit.html:142 cps/templates/user_edit.html:82
+msgid "Show Random Books in Detail View"
+msgstr "Προβολή Τυχαίων Βιβλίων σε Προβολή Λεπτομερειών"
+
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:85
+msgid "Add Allowed/Denied Tags"
+msgstr "Προσθήκη ετικετών Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr "Προσθήκη τιμών ειδικά κατασκευασμένων στηλών Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/detail.html:59
+msgid "Read in Browser"
+msgstr "Διάβασε στο Πρόγραμμα Περιήγησης"
+
+#: cps/templates/detail.html:72
+msgid "Listen in Browser"
+msgstr "ʼΑκουσε στο Πρόγραμμα Περιήγησης"
+
+#: cps/templates/detail.html:117
+msgid "Book"
+msgstr "Βιβλίο"
+
+#: cps/templates/detail.html:117
+msgid "of"
+msgstr "από"
+
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr "Εκδόθηκε"
+
+#: cps/templates/detail.html:208
+msgid "Mark As Unread"
+msgstr "Σήμανση ως Αδιάβαστο"
+
+#: cps/templates/detail.html:208
+msgid "Mark As Read"
+msgstr "Σήμανση ως Διαβασμένο"
+
+#: cps/templates/detail.html:209
+msgid "Read"
+msgstr "Διαβάστηκε"
+
+#: cps/templates/detail.html:217
+msgid "Restore from archive"
+msgstr "Επαναφορά από το αρχείο"
+
+#: cps/templates/detail.html:217
+msgid "Add to archive"
+msgstr "Προσθήκη στο αρχείο"
+
+#: cps/templates/detail.html:218
+msgid "Archived"
+msgstr "Αρχειοθετήθηκε"
+
+#: cps/templates/detail.html:229
+msgid "Description:"
+msgstr "Περιγραφή"
+
+#: cps/templates/detail.html:242 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "Προσθήκη στο ράφι"
+
+#: cps/templates/detail.html:253 cps/templates/detail.html:270
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
+#: cps/templates/search.html:20
+msgid "(Public)"
+msgstr "(Δημόσιο)"
+
+#: cps/templates/detail.html:284
+msgid "Edit Metadata"
+msgstr "Επεξεργασία Μεταδεδομένων"
+
+#: cps/templates/email_edit.html:22
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:23
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:31
+msgid "SMTP Password"
+msgstr "SMTP Κωδικός"
+
+#: cps/templates/email_edit.html:38
+msgid "Attachment Size Limit"
+msgstr "Όριο Μεγέθους Επισύναψης"
+
+#: cps/templates/email_edit.html:46
+msgid "Save and Send Test E-mail"
+msgstr "Αποθήκευση και Αποστολή E-mail Δοκιμής"
+
+#: cps/templates/email_edit.html:51
+msgid "Allowed Domains (Whitelist)"
+msgstr "Επιτρεπόμενα Domains (Λευκή λίστα)"
+
+#: cps/templates/email_edit.html:54 cps/templates/email_edit.html:80
+msgid "Add Domain"
+msgstr "Προσθήκη Domain"
+
+#: cps/templates/email_edit.html:57 cps/templates/email_edit.html:83
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: cps/templates/email_edit.html:62 cps/templates/email_edit.html:72
+msgid "Enter domainname"
+msgstr "Όνομα domain"
+
+#: cps/templates/email_edit.html:68
+msgid "Denied Domains (Blacklist)"
+msgstr "Domains που Απορρίφθηκαν (Μαύρη λίστα)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+msgid "Next"
+msgstr "Επόμενο"
+
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "ʼΑνοιξε το .kobo/Kobo eReader.conf αρχείο σε πρόγραμμα επεξεργασίας κειμένου και πρόσθεσε (ή κάνε επεξεργασία):"
+
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Όλα"
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr "Δημιουργία Θέματος"
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
+msgstr "Επιστροφή στην Κεντρική"
+
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
+msgid "Sort authors in alphabetical order"
+msgstr ""
+
+#: 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:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "Έναρξη"
+
+#: cps/templates/index.xml:21
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "Δημοφιλείς εκδόσεις από αυτό τον κατάλογο με βάση τις Λήψεις."
+
+#: cps/templates/index.xml:28
+msgid "Popular publications from this catalog based on Rating."
+msgstr "Δημοφιλείς εκδόσεις από αυτό τον κατάλογο με βάση την Αξιολόγηση."
+
+#: cps/templates/index.xml:31
+msgid "Recently added Books"
+msgstr "Βιβλία που προστέθηκαν Πρόσφατα"
+
+#: cps/templates/index.xml:35
+msgid "The latest Books"
+msgstr "Τα τελευταία Βιβλία"
+
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Τυχαία Βιβλία"
+
+#: cps/templates/index.xml:42
+msgid "Show Random Books"
+msgstr "Προβολή Τυχαίων Βιβλίων"
+
+#: cps/templates/index.xml:65
+msgid "Books ordered by Author"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά Συγγραφέα"
+
+#: cps/templates/index.xml:72
+msgid "Books ordered by publisher"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά εκδότη"
+
+#: cps/templates/index.xml:79
+msgid "Books ordered by category"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά κατηγορία"
+
+#: cps/templates/index.xml:86
+msgid "Books ordered by series"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά σειρές"
+
+#: cps/templates/index.xml:93
+msgid "Books ordered by Languages"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά Γλώσσες"
+
+#: cps/templates/index.xml:100
+msgid "Books ordered by Rating"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά Αξιολόγηση"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by file formats"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά μορφές αρχείου"
+
+#: cps/templates/index.xml:111 cps/templates/layout.html:135
+msgid "Shelves"
+msgstr "Ράφια"
+
+#: cps/templates/index.xml:115
+msgid "Books organized in shelves"
+msgstr "Βιβλία οργανωμένα σε ράφια"
+
+#: cps/templates/layout.html:29
+msgid "Home"
+msgstr "Κεντρική"
+
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
+msgid "Back"
+msgstr "Πίσω"
+
+#: cps/templates/layout.html:35
+msgid "Toggle Navigation"
+msgstr "Αλλαγή Θέσης Περιήγησης"
+
+#: cps/templates/layout.html:46
+msgid "Search Library"
+msgstr "Αναζήτηση Βιβλιοθήκης"
+
+#: cps/templates/layout.html:77 cps/templates/read.html:71
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: cps/templates/layout.html:79
+msgid "Account"
+msgstr "Λογαριασμός"
+
+#: cps/templates/layout.html:81
+msgid "Logout"
+msgstr "Αποσύνδεση"
+
+#: cps/templates/layout.html:86 cps/templates/register.html:16
+msgid "Register"
+msgstr "Εγγραφή"
+
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
+msgid "Uploading..."
+msgstr "Φόρτωση..."
+
+#: cps/templates/layout.html:118
+msgid "Please do not refresh the page"
+msgstr "Παρακαλούμε μην ανανεώσεις τη σελίδα"
+
+#: cps/templates/layout.html:128
+msgid "Browse"
+msgstr "Περιήγηση"
+
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
+msgid "About"
+msgstr "Σχετικά"
+
+#: cps/templates/layout.html:155
+msgid "Previous"
+msgstr "Προηγούμενο"
+
+#: cps/templates/layout.html:182
+msgid "Book Details"
+msgstr "Λεπτομέρειες Βιβλίου"
+
+#: cps/templates/layout.html:206
+msgid "Upload done, processing, please wait..."
+msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
+
+#: cps/templates/layout.html:209
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: cps/templates/login.html:17
+msgid "Remember Me"
+msgstr "Να με Θυμάσαι"
+
+#: cps/templates/login.html:22
+msgid "Forgot Password?"
+msgstr "Ξέχασες τον Κωδικό;"
+
+#: cps/templates/login.html:25
+msgid "Log in with Magic Link"
+msgstr "Σύνδεση με το Μαγικό Σύνδεσμο"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web Log: "
+msgstr "Προβολή Φύλλου Καταγραφής Calibre-Web:"
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web Log: "
+msgstr "Calibre-Web Φύλλο Καταγραφής:"
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr "Η ροή απόδοσης, δεν μπορεί να εμφανιστεί"
+
+#: cps/templates/logviewer.html:12
+msgid "Show Access Log: "
+msgstr "Προβολή Φύλλου Καταγραφής Πρόσβασης:"
+
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
+msgid "Select Allowed/Denied Tags"
+msgstr "Επιλογή Ετικετών Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:7
+msgid "Select Allowed/Denied Custom Column Values"
+msgstr "Επιλογή Τιμών Ειδικά Προσαρμοσμένης Στήλης Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:8
+msgid "Select Allowed/Denied Tags of User"
+msgstr "Επιλογή Ετικετών Χρήστη Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:9
+msgid "Select Allowed/Denied Custom Column Values of User"
+msgstr "Επιλογή Τιμών Χρήστη Ειδικά Προσαρμοσμένης Στήλης Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:15
+msgid "Enter Tag"
+msgstr "Εισαγωγή Ετικέτας"
+
+#: cps/templates/modal_dialogs.html:24
+msgid "Add View Restriction"
+msgstr "Προσθήκη Περιορισμού Προβολής"
+
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Αυτή η μορφή βιβλίου θα διαγραφεί για πάντα από τη βάση δεδομένων"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Αυτό το βιβλίο θα διαγραφεί για πάντα από τη βάση δεδομένων"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "και σκληρός δίσκος"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Σημαντική Σημείωση Kobo: τα διαγραμμένα βιβλία θα παραμείνουν σε οποιαδήποτε συνδεδεμένη συσκευή Kobo."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Τα βιβλία πρέπει πρώτα να αρχειοθετηθούν και να συγχρονιστεί η συσκευή πριν μπορέσει να διαγραφεί με ασφάλεια το βιβλίο."
+
+#: cps/templates/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"
+
+#: cps/templates/read.html:74
+msgid "Reflow text when sidebars are open."
+msgstr "Επανάληψη ροής κειμένου όταν οι μπάρες στο πλάι είναι ανοιχτές."
+
+#: cps/templates/readcbr.html:89
+msgid "Keyboard Shortcuts"
+msgstr "Συντομεύσεις Πληκτρολογίου"
+
+#: cps/templates/readcbr.html:92
+msgid "Previous Page"
+msgstr "Προηγούμενη Σελίδα"
+
+#: cps/templates/readcbr.html:93
+msgid "Next Page"
+msgstr "Επόμενη Σελίδα"
+
+#: cps/templates/readcbr.html:94
+msgid "Scale to Best"
+msgstr "Κλιμάκωση στο Καλυτερο"
+
+#: cps/templates/readcbr.html:95
+msgid "Scale to Width"
+msgstr "Κλιμάκωση σε Πλάτος"
+
+#: cps/templates/readcbr.html:96
+msgid "Scale to Height"
+msgstr "Κλιμάκωση σε Ύψος"
+
+#: cps/templates/readcbr.html:97
+msgid "Scale to Native"
+msgstr "Κλιμάκωση σε Τοπικό"
+
+#: cps/templates/readcbr.html:98
+msgid "Rotate Right"
+msgstr "Περιστροφή Δεξιά"
+
+#: cps/templates/readcbr.html:99
+msgid "Rotate Left"
+msgstr "Περιστροφή Αριστερά"
+
+#: cps/templates/readcbr.html:100
+msgid "Flip Image"
+msgstr "Γύρισμα Σελίδας"
+
+#: cps/templates/readcbr.html:116
+msgid "Light"
+msgstr "Φωτεινό"
+
+#: cps/templates/readcbr.html:117
+msgid "Dark"
+msgstr "Σκοτεινό"
+
+#: cps/templates/readcbr.html:122
+msgid "Scale"
+msgstr "Κλίμακα"
+
+#: cps/templates/readcbr.html:125
+msgid "Best"
+msgstr "Καλύτερο"
+
+#: cps/templates/readcbr.html:126
+msgid "Width"
+msgstr "Πλάτος"
+
+#: cps/templates/readcbr.html:127
+msgid "Height"
+msgstr "Ύψος"
+
+#: cps/templates/readcbr.html:128
+msgid "Native"
+msgstr "Ντόπιο"
+
+#: cps/templates/readcbr.html:133
+msgid "Rotate"
+msgstr "Περιστροφή"
+
+#: cps/templates/readcbr.html:144
+msgid "Flip"
+msgstr "Γύρισμα"
+
+#: cps/templates/readcbr.html:147
+msgid "Horizontal"
+msgstr "Οριζόντιο"
+
+#: cps/templates/readcbr.html:148
+msgid "Vertical"
+msgstr "Κάθετο"
+
+#: cps/templates/readcbr.html:153
+msgid "Direction"
+msgstr "Κατεύθυνση"
+
+#: cps/templates/readcbr.html:156
+msgid "Left to Right"
+msgstr "Αριστερά προς Δεξιά"
+
+#: cps/templates/readcbr.html:157
+msgid "Right to Left"
+msgstr "Δεξιά προς Αριστερά"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF reader"
+msgstr "PDF πρόγραμμα ανάγνωσης"
+
+#: cps/templates/readtxt.html:6
+msgid "Basic txt Reader"
+msgstr "Βασικό Πρόγραμμα Ανάγνωσης txt"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "Εγγραφή Νέου Λογαριασμού"
+
+#: cps/templates/register.html:9
+msgid "Choose a username"
+msgstr "Επιλογή ενός ονόματος χρήστη"
+
+#: cps/templates/register.html:14
+msgid "Your email address"
+msgstr "Η διεύθυνση email σου"
+
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr "Μαγικός Σύνδεσμος - Εξουσιοδότηση Νέας Συσκευής"
+
+#: cps/templates/remote_login.html:6
+msgid "On another device, login and visit:"
+msgstr "Σε μια άλλη συσκευή, σύνδεση και επίσκεψη:"
+
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "Με την επαλήθευση, θα συνδεθείτε αυτόματα σε αυτή τη συσκευή."
+
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
+msgstr "Αυτός ο σύνδεσμος επαλήθευσης θα λήξει σε 10 λεπτά."
+
+#: cps/templates/search.html:5
+msgid "No Results Found"
+msgstr "Δεν Βρέθηκαν Αποτελέσματα"
+
+#: cps/templates/search.html:6
+msgid "Search Term:"
+msgstr "Όρος Αναζήτησης:"
+
+#: cps/templates/search.html:8
+msgid "Results for:"
+msgstr "Αποτελέσματα για:"
+
+#: cps/templates/search_form.html:20
+msgid "Published Date From"
+msgstr "Ημερομηνία Έκδοσης Από"
+
+#: cps/templates/search_form.html:27
+msgid "Published Date To"
+msgstr "Ημερομηνία Έκδοσης Μέχρι"
+
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
+msgid "Exclude Tags"
+msgstr "Εξαίρεση Ετικετών"
+
+#: cps/templates/search_form.html:70
+msgid "Exclude Series"
+msgstr "Εξαίρεση Σειρών"
+
+#: cps/templates/search_form.html:89
+msgid "Exclude Languages"
+msgstr "Εξαίρεση Γλωσσών"
+
+#: cps/templates/search_form.html:100
+msgid "Extensions"
+msgstr "Επεκτάσεις"
+
+#: cps/templates/search_form.html:108
+msgid "Exclude Extensions"
+msgstr "Εξαίρεση Επεκτάσεων"
+
+#: cps/templates/search_form.html:118
+msgid "Rating Above"
+msgstr "Βαθμολογία Πάνω από"
+
+#: cps/templates/search_form.html:122
+msgid "Rating Below"
+msgstr "Βαθμολογία Κάτω από"
+
+#: cps/templates/shelf.html:10
+msgid "Delete this Shelf"
+msgstr "Διαγραφή αυτού του Ραφιού"
+
+#: cps/templates/shelf.html:11
+msgid "Edit Shelf Properties"
+msgstr ""
+
+#: 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 "Το ράφι θα διαγραφεί για όλους τουε χρήστες"
+
+#: cps/templates/shelf_edit.html:13
+msgid "Share with Everyone"
+msgstr "Κοινοποίηση με Όλους"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "Σύρε για Αναδιάταξη Σειράς"
+
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Κρυμμένο Βιβλίο"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Στατιστικά Βιβλιοθήκης"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "Βιβλία σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "Συγγραφείς σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "Κατηγορίες σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "Σειρές σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:29
+msgid "System Statistics"
+msgstr ""
+
+#: cps/templates/stats.html:33
+msgid "Program Library"
+msgstr "Πρόγραμμα Βιβλιοθήκης"
+
+#: cps/templates/stats.html:34
+msgid "Installed Version"
+msgstr "Εγκατεστημένη Έκδοση"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "Χρήστης"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "Εργασία"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "Πρόοδος"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "Χρόνος Λειτουργίας"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "Ώρα Έναρξης"
+
+#: cps/templates/tasks.html:24
+msgid "Delete finished tasks"
+msgstr "Διαγραφή ολοκληρωμένων εργασιών"
+
+#: cps/templates/tasks.html:25
+msgid "Hide all tasks"
+msgstr "Απόκρυψη όλων των εργασιών"
+
+#: cps/templates/user_edit.html:19
+msgid "Reset user Password"
+msgstr "Επαναφορά Κωδικού χρήστη"
+
+#: cps/templates/user_edit.html:42
+msgid "Language of Books"
+msgstr "Γλώσσα Βιβλίων"
+
+#: cps/templates/user_edit.html:44
+msgid "Show All"
+msgstr "Προβολή Όλων"
+
+#: cps/templates/user_edit.html:53
+msgid "OAuth Settings"
+msgstr "OAuth Ρυθμίσεις"
+
+#: cps/templates/user_edit.html:55
+msgid "Link"
+msgstr "Σύνδεση"
+
+#: cps/templates/user_edit.html:57
+msgid "Unlink"
+msgstr "Αποσύνδεση"
+
+#: cps/templates/user_edit.html:63
+msgid "Kobo Sync Token"
+msgstr "Kobo Μονάδα Συγχρονισμού"
+
+#: cps/templates/user_edit.html:65
+msgid "Create/View"
+msgstr "Δημιουγία/Προβολή"
+
+#: cps/templates/user_edit.html:86
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "Προσθήκη Τιμών Ειδικά Προσαρμοσμένης Στήλης επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/user_edit.html:135
+msgid "Delete User"
+msgstr "Διαγραφή Χρήστη"
+
+#: cps/templates/user_edit.html:146
+msgid "Generate Kobo Auth URL"
+msgstr "Δημιουργία Kobo Auth URL"
+
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index f032b113..bb50e1db 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 2e4f1ede..85861e65 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,383 +18,428 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "instalado"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "no instalado"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "El servidor se está apagando. Por favor, cierre la ventana"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Reconexión correcta"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz de usuario"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "¿Realmente quieres borrar el Token de Kobo?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "¿Realmente quiere eliminar este estante?"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 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:721
 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:555
+#: cps/admin.py:727
 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:581
+#: cps/admin.py:757
 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:594
+#: cps/admin.py:772
 #, 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:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, 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:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "La ruta del certificado LDAP no es válida. Por favor, introduzca la ruta correcta"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 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:634
+#: cps/admin.py:834
 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:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "La base de datos de configuración no es modificable"
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 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:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
-msgstr ""
+msgstr "La base de datos no es modificable"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, completa todos los campos!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 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:814
+#: cps/admin.py:1028
 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:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 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:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Ocurrió un error desconocido."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, 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:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 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:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 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:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 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:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 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/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Error: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Error al crear al menos un usuario LDAP"
+
+#: cps/admin.py:1389
+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:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "no configurado"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
-msgstr ""
+msgstr "Faltan permisos de ejecución"
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Formato de libro borrado correctamente"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Libro borrado correctamente"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
-msgstr ""
+msgstr "Error en la base de datos: %(error)s."
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, 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:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados correctamente"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Fallo al mover el archivo %(file)s: %(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, 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:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s a sido subido"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
@@ -403,184 +448,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formato no encontrado para el id del libro: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Enviar al Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s no encontrado: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Enviar al Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Correo de prueba de Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Comprobar correo electrónico"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Primeros pasos con Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Correo electrónico de registro para el usuario: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Enviado %(format)s al Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Convertir %(orig)s a %(format)s y enviar al Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Correo electrónico: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "El archivo solicitado no puede ser leído. ¿Quizás existen problemas con los permisos?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr ""
+msgstr "Fallo al intentar borrar la carpeta del libro %(id)s, la ruta tiene subcarpetas: %(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "El borrado del libro %(id)s falló: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Borrando el libro %(id)s, la ruta del libro es inválida: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "El renombrado del título de: '%(src)s' a '%(dest)s' falló con el error: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "El renombrado del autor de: '%(src)s' a '%(dest)s' falló con el errore: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Ha fallado el cambio de nombre del archivo '%(src)s' a '%(dest)s' con el error: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Fichero %(file)s no encontrado en Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
-msgstr ""
+msgstr "Error al descargar la cubierta"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
-msgstr ""
+msgstr "Error en el formato de la cubierta"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Error al crear una ruta para la cubierta"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "El archivo de cubierta no es una imágen válida"
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Siki kis archivos jpg/jpeg están soportados como cubierta"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "No se ha encontrado el binario del comando UnRar"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "Error ejecutando UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Esperando"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Fallido"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Comenzado"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Finalizado"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Convertir: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Subir: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Tarea desconocida:"
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, accede a calibre-web desde una ubicación que no sea localhost para obtener una api_endpoint válida para tu dispositivo Kobo"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Configuración de Kobo"
 
@@ -589,540 +613,555 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Error al iniciar sesión con GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 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:162
 msgid "Failed to log in with Google."
 msgstr "Error al iniciar sesión con Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 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:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, 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:229
 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:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "%(oauth)s desenlazado con éxito"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Error al desenlazar %(oauth)s"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr ""
+msgstr "No vinculado con %(oauth)s"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 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:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "iniciar sesión"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Token no encontrado"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "El token ha expirado"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "¡Correcto! Por favor regrese a su dispositivo"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Libros"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+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:735
+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
-#, 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Crear un estante"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, 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:231
+msgid "Edit a shelf"
+msgstr "Editar un estante"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Ha sucedido un error"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Crear un estante"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Editar un estante"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Estante: '%(name)s'"
+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: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:291
+#, 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:409
-msgid "Hidden Book"
-msgstr "Libro oculto"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Añadido recientemente"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Estante: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Mostrar libros recientes"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Libros populares"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Mostrar libros populares"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Libros mejor valorados"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Mostrar libros mejor valorados"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Libros leídos"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Mostrar leídos y no leídos"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Libros no leídos"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Mostrar no leído"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Descubrir"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Mostrar libros al azar"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Categorías"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Mostrar selección de categorías"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Series"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Mostrar selección de series"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Autores"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Mostrar selección de autores"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Editores"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Mostrar selección de editores"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Idiomas"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Mostrar selección de idiomas"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Calificaciones"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Mostrar selección de calificaciones"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Formatos de archivo"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Mostrar selección de formatos de archivo"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "Libros archivados"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "Mostrar libros archivados"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Dato inesperado mientras se leía la información de actualización"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Actualización no disponible. Ya tienes instalada la versión más reciente"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Una nueva actualización está disponible. Haz clic en el botón inferior para actualizar a la versión más reciente."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "No se puede conseguir información sobre la actualización"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo para actualizar a la versión: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Haz clic en el botón de abajo para actualizar a la última versión estable."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Error al crear al menos un usuario LDAP"
-
-#: cps/web.py:374
-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:376
-msgid "User Successfully Imported"
-msgstr "Usuario importado correctamente"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Libros añadidos recientemente"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Libros"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Lista de calificaciones"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Lista de formatos"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Tareas"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Buscar"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Publicado después de "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Publicado antes de "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Calificación <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Calificación >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "búsqueda"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Búsqueda avanzada"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Buscar"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Lista de calificaciones"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Lista de formatos"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Tareas"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Publicado después de "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Publicado antes de "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Calificación <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Calificación >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 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:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, 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:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 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:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "iniciar sesión"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Token no encontrado"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "El token ha expirado"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "¡Correcto! Por favor regrese a su dispositivo"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Falló Ebook-converter: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Falló Ebook-converter: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Lista de usuarios"
@@ -1161,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:62
 msgid "Download"
 msgstr "Descargar"
 
@@ -1174,24 +1212,24 @@ msgid "Edit"
 msgstr "Editar"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Borrar"
 
 #: cps/templates/admin.html:23
 msgid "Public Shelf"
-msgstr ""
+msgstr "Estantería pública"
 
 #: cps/templates/admin.html:44
 msgid "Add New User"
 msgstr "Añadir nuevo usuario"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "Importar usuarios LDAP"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "Ajustes del servidor de correo electrónico"
 
@@ -1199,145 +1237,150 @@ msgstr "Ajustes del servidor de correo electrónico"
 msgid "SMTP Hostname"
 msgstr "Servidor SMTP"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "Puerto SMTP"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "Encriptado"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Desde el correo"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Configuración"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Directorio de la base de datos de Calibre"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Nivel de registro"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Puerto"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
-msgstr ""
+msgstr "Puerto externo"
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Libros por página"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Subidas"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Navegación anónima"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Registro público"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Acceso remoto mediante enlace mágico"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Acceso mediante Proxy inverso"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Nombre de cabecera de proxy inverso"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Editar la configuración básica"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Editar la configuración de la interfaz de usuario"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Administración"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Ver archivos de registro"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Reconectar a la BD Calibre"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Actualizar"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Versión"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Detalles"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Versión actual"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Comprobar actualizaciones"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Realizar actualización"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quieres reiniciar?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "¿Realmente quiere detener?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Actualizando. Por favor, no recargue la página"
 
@@ -1349,20 +1392,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "En la Librería"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Todo"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Más de"
 
@@ -1394,17 +1461,17 @@ msgstr "Convertir a:"
 msgid "Convert book"
 msgstr "Convertir libro"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Título del libro"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1412,15 +1479,15 @@ msgstr "Descripción"
 msgid "Identifiers"
 msgstr "Identificadores"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Borrar"
 
@@ -1428,7 +1495,7 @@ msgstr "Borrar"
 msgid "Add Identifier"
 msgstr "Añadir identificador"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -1440,390 +1507,494 @@ msgstr "ID de serie"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Obtener portada de URL (JPEG, la portada ser'a descargada y almacenada en la base de datos)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Subir portada desde un disco local"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Fecha de publicación"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Subir formato"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Ver libro tras la edición"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "¿Estás realmente seguro?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "El libro será eliminado de la base de datos de Calibre"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "y del disco duro"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Nota de Kobo importante:los libros borrados permanecerán en los dispositivos Kobo emparejados."
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Antes de que un libro pueda ser borrado con seguridad debe ser archivado y sincronixado con el dispositivo."
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Palabra clave"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Buscar por palabras clave "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Origen"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
-#: cps/templates/book_edit.html:297
+#: 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."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Título"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "¿Estás realmente seguro?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Configuración de la librería"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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 ""
+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 ""
+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 ""
+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:268
-msgid "LDAP Certificate Path"
-msgstr "Ruta del certificado LDAP"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Autenticación LDAP"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "No autenticado"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Simple"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nombre de usuario de administrador LDAP"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Contraseña de administrador LDAP"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Nombre distinguido LDAP (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Filtro de objetos de usuario LDAP"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "¿El servidor LDAP es OpenLDAP?"
 
-#: cps/templates/config_edit.html:304
+#: 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:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtro de objetos de grupo LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Nombre de grupo LDAP"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Campo de miembros de grupo LDAP"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Binarios externos"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
-msgstr ""
+msgstr "Ruta para Calibre E-Book Converter"
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
-msgstr ""
+msgstr "Configuración de Calibre E-Book Converter"
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
-msgstr ""
+msgstr "Ruta para Kepubify E-Book Converter"
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Ubicación del binario de Unrar"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1832,10 +2003,6 @@ msgstr "Inicio de sesión"
 msgid "View Configuration"
 msgstr "Ver configuración"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Título"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Número de libros aleatorios a mostrar"
@@ -1844,7 +2011,7 @@ msgstr "Número de libros aleatorios a mostrar"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Número de autores para mostrar antes de ocultar (0 = desactivar la ocultación)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Tema"
 
@@ -1978,7 +2145,7 @@ msgstr "Agregar al estante"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Público)"
 
@@ -2026,11 +2193,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2038,6 +2201,10 @@ msgstr "Siguiente"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Abre el archivo .kobo/Kobo eReader.conf en un editor de texto y añade (o edita):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Todo"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "Abrir una incidencia"
@@ -2046,9 +2213,23 @@ msgstr "Abrir una incidencia"
 msgid "Return to Home"
 msgstr "Volver al inicio"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Grupo por serie"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2118,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Regresar"
 
@@ -2131,12 +2311,8 @@ msgstr "Alternar navegación"
 msgid "Search Library"
 msgstr "Buscar en la librería"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Búsqueda avanzada"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -2152,7 +2328,7 @@ msgstr "Cerrar sesión"
 msgid "Register"
 msgstr "Registro"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Cargando..."
 
@@ -2164,27 +2340,23 @@ msgstr "Por favor, no actualice la página"
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Sus estantes"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Detalles del libro"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Error"
 
@@ -2216,30 +2388,82 @@ msgstr "La salida del flujo no pudo ser mostrada"
 msgid "Show Access Log: "
 msgstr "Mostrar registro de acceso:"
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Seleccionar etiquetas Permitidas/Denegadas"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Seleccionar valores propios de columnas Permitidas/Denegadas"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Seleccionar etiquetas de usuario Permitido/Denegado"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Seleccionar columnas propias de usuario Permitido/Denegado"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Introduce la etiqueta"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Añadir restricción de vista"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "El libro será eliminado de la base de datos de Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "y del disco duro"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Nota de Kobo importante:los libros borrados permanecerán en los dispositivos Kobo emparejados."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Antes de que un libro pueda ser borrado con seguridad debe ser archivado y sincronixado con el dispositivo."
+
+#: cps/templates/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"
@@ -2248,99 +2472,99 @@ msgstr "Cátalogo de ebook de Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Página previa"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Escalar a mejor"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Escalar a la ancho"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Escalar a lo alto"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Escalado nativo"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Rotar hacia la derecha"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Rotar hacia la izquierda"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Voltear imagen"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Oscuro"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Escalar"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Mejor"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Ancho"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Alto"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Nativo"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Rotar"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Voltear"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Dirección"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "De izquierda a derecha"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "De derecha a izquierda"
 
@@ -2392,39 +2616,43 @@ msgstr "Término de búsqueda:"
 msgid "Results for:"
 msgstr "Resultados para:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Fecha de publicación desde"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Fecha de publicación hasta"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Excluir etiquetas"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Excluir series"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Excluir idiomas"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Extensiones excluidas"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Clasificación mayor que"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Clasificación menor que"
 
@@ -2433,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:67
-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:70
+#: 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"
 
@@ -2456,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"
@@ -2477,8 +2713,8 @@ msgid "Series in this Library"
 msgstr "Series en esta biblioteca"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Bibliotecas vinculadas"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2556,19 +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:146
-msgid "Recent Downloads"
-msgstr "Descargas recientes"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Generar Auth URL de Kobo"
 
-#: cps/templates/user_edit.html:178
-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 af11907a..a1755f5b 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 4884a822..3975048f 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,382 +16,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "asennettu"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "ei asennettu"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Palvelin uudelleenkäynnistetty, ole hyvä ja päivitä sivu"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Palvelinta sammutetaan, ole hyvä ja sulje sivu"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Ylläpitosivu"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 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:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 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:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 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:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Tapahtui tuntematon virhe."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testisähköposti lähetetty onnistuneesti osoitteeseen %(kindlemail)s"
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 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:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr ""
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "muokkaa metadataa"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ei ole kelvollinen kieli"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Kirjan editoinnissa tapahtui virhe, tarkista virheilmoitus lokista"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
@@ -400,184 +445,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s tiedostomuotoa ei löytynyt kirjalle: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Lähetä Kindleen"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Tämä sähköposti on lähetetty Calibre-Web:sta."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s ei löydy: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Lähetä Kindleen"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+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:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web testisähköposti"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Testi sähköposti"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Aloita Calibre-Web:in käyttö"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rekiströintisähköposti käyttäjälle: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Lähetä %(format)s Kindleen"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Muunna %(orig)s muotoon %(format)s ja lähetä Kindleen"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Sähköposti: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Haettua tiedostoa ei pystytty lukemaan. Ehkä vaäärät oikeudet?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Tiedon muuttaminen arvosta: '%(src)s' arvoon '%(dest)s' epäonnistui virheeseen: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Kirjailijan muuttaminen arvosta: \"%(src)s\" arvoon \"%(dest)s\" epäonnistui virheeseen: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Tiedoston nimeäminen polusta '%(src)s' polkuun '%(dest)s' epäonnistui virheeseen: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Aloitettu"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Valmistui"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "Sähköposti: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Muunna: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Lähetä: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Tuntematon tehtävä: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr ""
 
@@ -586,540 +610,555 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "GitHubiin kirjautuminen epäonnistui."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 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:162
 msgid "Failed to log in with Google."
 msgstr "Googleen kirjautuminen epäonnistui."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 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:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth virhe, yritä myöhemmin uudelleen."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "kirjaudu"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Valtuutusta ei löytynyt"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Valtuutus vanhentunut"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Kirjat"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "luo hylly"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Muokkaa hyllyä"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hylly %(title)s luotu"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Tapahtui virhe"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "luo hylly"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hylly %(title)s muutettu"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Muokkaa hyllyä"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, 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"
+msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:414
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Viimeksi lisätty"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Hylly: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Näytä viimeisimmät kirjat"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Kuumat kirjat"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Näytä kuumat kirjat"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Parhaiten arvioidut kirjat"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Näytä parhaiten arvioidut kirjat"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Luetut kirjat"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Näytä luetut ja lukemattomat"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Lukemattomat kirjat"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Näyt lukemattomat"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Löydä"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Näytä satunnaisia kirjoja"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Kategoriat"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Näytä kategoriavalinta"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Sarjat"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Näytä sarjavalinta"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Kirjailijat"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Näytä kirjailijavalinta"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Julkaisijat"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Näytä julkaisijavalinta"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Kielet"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Näytä keilivalinta"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Arvostelut"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Näytä arvosteluvalinta"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Tiedotomuodot"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Näytä tiedostomuotovalinta"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Odottamatonta tietoa luettaessa päivitystietoa"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Ei päivitystä saatavilla. Sinulla on jo uusin versio"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi uusimpaan versioon."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Päivitystiedon hakeminen epäonnistui"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Ei päivitystietoa saatavilla"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi versioon: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Paina alla olevaa nappia päivittääksesi uusimpaan vakaaseen versioon."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Viimeksi lisätyt kirjat"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Kirjat"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Arvostelulistaus"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Tiedostomuotolistaus"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Hae"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Julkaistu alkaen "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Julkaisut ennen "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Arvostelu <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Arvostelu >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "hae"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Edistynyt haku"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Hae"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Arvostelulistaus"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Tiedostomuotolistaus"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Julkaistu alkaen "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Julkaisut ennen "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Arvostelu <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Arvostelu >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "rekisteröidy"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "kirjaudu"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Valtuutusta ei löytynyt"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Valtuutus vanhentunut"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Lue kirja"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "E-kirjan muunnos epäonnistui: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "E-kirjan muunnos epäonnistui: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Käyttäjälista"
@@ -1158,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:62
 msgid "Download"
 msgstr "Lataa"
 
@@ -1171,8 +1209,8 @@ msgid "Edit"
 msgstr "Muokkaa"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Poista"
 
@@ -1184,11 +1222,11 @@ msgstr ""
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "SMTP sähköpostipalvelimen asetukset"
 
@@ -1196,145 +1234,150 @@ msgstr "SMTP sähköpostipalvelimen asetukset"
 msgid "SMTP Hostname"
 msgstr "SMTP palvein"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP portti"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP tunnus"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Lähettäjän sähköposti"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Calibre DB hakemisto"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Lokitaso"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Portti"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Kirjaa sivulla"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Lähetetään"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Nimetön selaus"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Julkinen rekisteröinti"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Etäkirjautuminen"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr ""
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Ylläpito"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Katsele lokitiedostoja"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Uudelleenyhdistä Calibre DB"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Uudellenkäynnistä Calibre-Web"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Sammuta Calibre-Web"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Päivitä"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Versio"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Nykyinen versio"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Tarkista päivitykset"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Päivitä"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Päivitetään, älä päivitä sivua"
 
@@ -1346,20 +1389,44 @@ msgstr ""
 msgid "In Library"
 msgstr "Kirjastossa"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Kaikki"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Enemmän"
 
@@ -1391,17 +1458,17 @@ msgstr "Muunna muotoon:"
 msgid "Convert book"
 msgstr "Muunna kirja"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Kirjan otsikko"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1409,15 +1476,15 @@ msgstr "Kuvaus"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1425,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Tunnisteet"
 
@@ -1437,390 +1504,494 @@ msgstr ""
 msgid "Rating"
 msgstr "Arvostelu"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Kannen osoite (jpg, kuva ladataan ja tallennetaan tietokantaan, kenttä jää uudelleen tyhjäksi)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Lataa kuva paikalliselta levyltä"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Julkaisupäivä"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Kieli"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ei"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Lataa tiedostomuoto"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "katso kirjaa muokkauksen jälkeen"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Oletko aivan varma?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Kirja poistetaan Calibren tietokannasta"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "ja kiintolevyltä"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Avainsana"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Hae avainsanaa "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Lähde"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Hakuvirhe!"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Ei osumia! Kokeile jotain tosita hakusanaa."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Otsikko"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Oletko aivan varma?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Kirjaston asetukset"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:282
+#: 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:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP pääkäyttäjän salasana"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP DN"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP käyttäjä suodin (object filter)"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP palvelin on OpenLDAP?"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Ulkoiset binäärit"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrar binäärin paikka"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1829,10 +2000,6 @@ msgstr "Kirjaudu sisään"
 msgid "View Configuration"
 msgstr "Näytä konfiguraatio"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Otsikko"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Satunnaisten kirjojen näytön lukumäärä"
@@ -1841,7 +2008,7 @@ msgstr "Satunnaisten kirjojen näytön lukumäärä"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Kirjailijoiden lukumäärä ennen piilotusta (0=poista piilotus)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Teema"
 
@@ -1975,7 +2142,7 @@ msgstr "Lisää hyllyyn"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2023,11 +2190,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Seuraava"
 
@@ -2035,6 +2198,10 @@ msgstr "Seuraava"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Kaikki"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "Luo virheilmoitus"
@@ -2043,9 +2210,23 @@ msgstr "Luo virheilmoitus"
 msgid "Return to Home"
 msgstr "Palaa kotiin"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Ryhmitä sarjoittain"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2115,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "Koti"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Palaa"
 
@@ -2128,12 +2308,8 @@ msgstr "Vaihda navigointi"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Edistynyt haku"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Asetukset"
 
@@ -2149,7 +2325,7 @@ msgstr "Kirjaudu ulos"
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Ladataan..."
 
@@ -2161,27 +2337,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Selaa"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Omat hyllysi"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tietoja"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Edellinen"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Virhe"
 
@@ -2213,30 +2385,82 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Kirja poistetaan Calibren tietokannasta"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "ja kiintolevyltä"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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"
@@ -2245,99 +2469,99 @@ msgstr "Calibre-Web e-kirjaluettelo"
 msgid "Reflow text when sidebars are open."
 msgstr "Uudelleenjärjestä teksti kun sivut on auki."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Näppäimistöpikakomennot"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Edellinen sivu"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Seuraava sivu"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Skaalaa parhaaseen"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Skaalaa leveyteen"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Skaalaa korkeuteen"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Skaalaa alkuperäiseen"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Käännä oikealle"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Käännä vasemmalle"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Käännä kuva"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Vaalea"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Tumma"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Skaalaa"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Paras"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Leveys"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Korkeus"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Alkuperäinen"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Pyöritä"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Käännä"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Vaakasuunta"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Pystysuunta"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Suunta"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Vasemmalta oikealle"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Oikealta vasemmalle"
 
@@ -2389,39 +2613,43 @@ msgstr ""
 msgid "Results for:"
 msgstr "Tulosket haulle:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Julkaisupäivästä"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Julkaisupäivään"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Poissulje merkintä"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Poissulje sarja"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Poissulje kieli"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Arvio enemmän kun"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Arvio vähemmän kun"
 
@@ -2430,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:67
-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:70
+#: 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!"
 
@@ -2453,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"
@@ -2474,8 +2710,8 @@ msgid "Series in this Library"
 msgstr "Sarjat kirjastossa"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Linkitetyt kirjastot"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2553,19 +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:146
-msgid "Recent Downloads"
-msgstr "Viimeisimmät lataukset"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
-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 92465bfb..68cfb3d4 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 abd89464..61b0152d 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: Dekani <dekani1500@gmail.com>\n"
 "Language: fr\n"
@@ -30,382 +30,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "installé"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "non installé"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Reconnecté avec succès"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Page admin"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Voulez-vous vraiment supprimer le jeton Kobo?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 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:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 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:721
 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:555
+#: cps/admin.py:727
 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:581
+#: cps/admin.py:757
 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:594
+#: cps/admin.py:772
 #, 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:597
+#: cps/admin.py:775
 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:601
+#: cps/admin.py:780
 #, 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:604
+#: cps/admin.py:783
 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:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "L'emplacement du certificat LDAP est incorrect, veuillez saisir un chemin valide"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 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:634
+#: cps/admin.py:834
 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:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement DB est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "La DB n'est pas accessible en écriture"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 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:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 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:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, 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:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, 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:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 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:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 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:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 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/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Erreur : %(ldaperror)s"
+
+#: cps/admin.py:1320
+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:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Impossible de créer au moins un utilisateur LDAP"
+
+#: cps/admin.py:1389
+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:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "non configuré"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/editbooks.py:242
+#: 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:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, 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:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, 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:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Impossible de déplacer le fichier %(file)s: %(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, 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:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 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:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, 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"
@@ -414,184 +459,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "le format %(format)s est introuvable pour le livre : %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Envoyer vers Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ce courriel a été envoyé depuis Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s introuvable : %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Envoyer vers Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Ce courriel a été envoyé depuis Calibre-Web."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Courriel de test de Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Courriel de test"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Bien démarrer avec Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Envoyer %(format)s vers le Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Courriel : %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Le fichier demandé n’a pu être lu. Problème de permission d’accès ?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "La suppression du livre %(id)s a échoué: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Suppression du livre %(id)s, le chemin du livre est invalide : %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renommer le titre de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Renommer l’auteur de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modification du nom de fichier du chemin : '%(src)s' vers '%(dest)s' a échoué avec l’erreur : %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Le fichier %(file)s n'a pas été trouvé dans Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Le chemin du livre %(path)s n'a pas été trouvé dans Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Erreur lors du téléchargement de la couverture"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Erreur de format de couverture"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Impossible de créer le chemin pour la couverture"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Le fichier couverture n'est pas un fichier image valide, ou ne peut pas être stocké"
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg sont supportés comme fichier de couverture"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "En attente"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Echoué"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Débuté"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Terminé"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "Courriel : "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Convertir vers : "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Téléverser : "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Tâche inconnue : "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Veuilllez ne pas accéder à calibre-web par localhost pour obtenir un api_endpoint valide pour un appareil kobo"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Configuration Kobo"
 
@@ -600,540 +624,555 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Échec de la connexion avec GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 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:162
 msgid "Failed to log in with Google."
 msgstr "Échec de la connexion avec Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 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:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, 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:229
 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:271
 #, 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:275
 #, 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:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 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:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "connexion"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Jeton non trouvé"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Jeton expiré"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Réussite! Merci de vous tourner vers votre appareil"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Livres"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+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:735
+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
-#, 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Créer une étagère"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, 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:231
+msgid "Edit a shelf"
+msgstr "Modifier une étagère"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Il y a eu une erreur"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Créer une étagère"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, 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
-msgid "Edit a shelf"
-msgstr "Modifier une étagère"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Étagère : '%(name)s'"
+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: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:291
+#, 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:409
-msgid "Hidden Book"
-msgstr "Livre caché"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Ajouts récents"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Étagère : '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Afficher les livres récents"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Livres populaires"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Montrer les livres populaires"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Livres les mieux notés"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Montrer les livres les mieux notés"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Livres lus"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Montrer lus et non-lus"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Livres non-lus"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Afficher non-lus"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Découvrir"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Montrer des livres au hasard"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Catégories"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Montrer la sélection par catégories"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Séries"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Montrer la sélection par séries"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Auteurs"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Montrer la sélection par auteur"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Éditeurs"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Montrer la sélection par éditeur"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Langues"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Montrer la sélection par langue"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Notes"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Afficher la sélection des évaluations"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Formats de fichier"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Afficher la sélection des formats de fichiers"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "Livres archivés"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "Afficher les livres archivés"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Données inattendues lors de la lecture des informations de mise à jour"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Aucune mise à jour disponible. Vous avez déjà la dernière version installée"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-dessous pour charger la dernière version."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Impossible d'extraire les informations de mise à jour"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-dessous pour charger la version: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Téléchargez la dernière version en cliquant sur le bouton ci-dessous."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Impossible de créer au moins un utilisateur LDAP"
-
-#: cps/web.py:374
-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:376
-msgid "User Successfully Imported"
-msgstr "L'utilisateur a été importé avec succès"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Ajouts récents de livres"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Livres"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Liste des évaluations"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Liste de formats de fichiers"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Tâches"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Chercher"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Publié après le "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Publié avant le "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Évaluation <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Évaluation >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "recherche"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Recherche avancée"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Chercher"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Liste des évaluations"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Liste de formats de fichiers"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Tâches"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Publié après le "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Publié avant le "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Évaluation <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Évaluation >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, 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:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 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:1427
+#: cps/web.py:1375
 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:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "connexion"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Jeton non trouvé"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Jeton expiré"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Réussite! Merci de vous tourner vers votre appareil"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "ebook-convert calibre %(tool)s non trouvé"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "La commande ebook-convert a échouée : %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "La commande Kepubify-converter a échouée : %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, 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:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "La commande ebook-convert a échouée : %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Liste des utilisateurs"
@@ -1172,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:62
 msgid "Download"
 msgstr "Télécharger"
 
@@ -1185,8 +1223,8 @@ msgid "Edit"
 msgstr "Éditer"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1198,11 +1236,11 @@ msgstr "Étagère publique"
 msgid "Add New User"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "Importer des utilisateurs LDAP"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "Paramètres du serveur de courriels"
 
@@ -1210,145 +1248,150 @@ msgstr "Paramètres du serveur de courriels"
 msgid "SMTP Hostname"
 msgstr "Nom d'hôte du serveur SMTP"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "Port du serveur SMTP"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
-msgstr "Cryptage"
+msgstr "Chiffrement"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "Compte utilisateur SMTP"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Expéditeur des courriels"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Configuration"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Répertoire de la base de données Calibre"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Niveau de journalisation"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Livres par page"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Téléversements"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Navigation anonyme"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Inscription publique"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Connexion à distance Magic Link"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Compte du Reverse Proxy"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Nom de l'en-tête du Reverse Proxy"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Éditer la configuration principale"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Afficher les fichiers journaux"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Reconnecter la base de données Calibre"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Redémarrer Calibre-Web"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Arrêter Calibre-Web"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Mise à jour de Calibre-Web"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Détails"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Version actuelle"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Rechercher les mises à jour"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -1360,20 +1403,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "Dans la librairie"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Tout"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Plus de"
 
@@ -1405,17 +1472,17 @@ msgstr "Convertir vers :"
 msgid "Convert book"
 msgstr "Convertir le livre"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1423,15 +1490,15 @@ msgstr "Description"
 msgid "Identifiers"
 msgstr "Identifiants"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1439,7 +1506,7 @@ msgstr "Supprimer"
 msgid "Add Identifier"
 msgstr "Ajouter un identifiant"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Étiquettes"
 
@@ -1451,390 +1518,494 @@ msgstr "ID de séries"
 msgid "Rating"
 msgstr "Évaluation"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Obtenir la couverture à partir d'une URL (JPEG - l'image sera téléchargée et sauvegardée dans la base de données)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Téléverser la couverture depuis un fichier en local"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Date de publication"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Non"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Format du fichier téléversé"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Voir le livre lors de la sauvegarde"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: 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:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Êtes-vous vraiment sûr?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Le livre va être supprimé définitivement de la base de données"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "et du disque dur"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Note Kobo importante: les livres supprimés vont rester sur l'appareil Kobo appairé."
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Les livres doivent d'abord être archivés et l'appareil synchronisé avant qu'un livre puisse être supprimé en tout sécurité."
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Source"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Erreur lors de la recherche!"
 
-#: cps/templates/book_edit.html:297
+#: 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é."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titre"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Êtes-vous vraiment sûr?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Configuration de la Bibliothèque"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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 "Cryptage LDAP"
+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:268
-msgid "LDAP Certificate Path"
-msgstr "Chemin du certificat LDAP"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Authentification LDAP"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Non authentifié"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Simple"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nom d'utilisateur de l'administrateur LDAP"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Mot de passe de l'administrateur LDAP"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Filtre objet de l'utilisateur LDAP"
 
-#: cps/templates/config_edit.html:302
+#: 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:304
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
-msgstr "Les paramètres suivant sont nécessaire pour importer un utilisateur"
+msgstr "Les paramètres suivant sont nécessaires pour importer un utilisateur"
 
-#: cps/templates/config_edit.html:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtre objet de groupe LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Nom de groupe LDAP"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Champ des membres de groupe LDAP"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Configuration des outils de conversion externes"
 
-#: cps/templates/config_edit.html:352
+#: 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:360
+#: 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:363
+#: 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:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Chemin d’accès à la commande UnRar"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1843,10 +2014,6 @@ msgstr "Connexion"
 msgid "View Configuration"
 msgstr "Configuration du mode d’affichage"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titre"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Nombre de livres choisis au hasard à afficher"
@@ -1855,7 +2022,7 @@ msgstr "Nombre de livres choisis au hasard à afficher"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Nombre d’auteurs à afficher avant de masquer (0=désactiver le masquage)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Thème"
 
@@ -1989,7 +2156,7 @@ msgstr "Ajouter à l'étagère"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Public)"
 
@@ -2037,11 +2204,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Suivant"
 
@@ -2049,6 +2212,10 @@ msgstr "Suivant"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Ouvrir le fichier .kobo/Kobo eReader.conf dans un éditeur de texte et ajouter (ou éditer):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Tout"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "Signaler un problème"
@@ -2057,9 +2224,23 @@ msgstr "Signaler un problème"
 msgid "Return to Home"
 msgstr "Retour à l’accueil"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Grouper par séries"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2129,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Retour"
 
@@ -2142,12 +2322,8 @@ msgstr "Basculer la navigation"
 msgid "Search Library"
 msgstr "Chercher dans librairie"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Recherche avancée"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -2163,7 +2339,7 @@ msgstr "Déconnexion"
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Téléversement en cours..."
 
@@ -2175,27 +2351,23 @@ msgstr "Veuillez ne pas rafraîchir la page"
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Vos étagères"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Détails du livre"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Erreur"
 
@@ -2227,30 +2399,82 @@ msgstr "Le flux de sortie ne peut pas être affiché"
 msgid "Show Access Log: "
 msgstr "Afficher le journal d'accès : "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Sélectionner les étiquettes autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Sélectionner les colonnes personnalisées autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Sélectionner les étiquettes d'utilisateur autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Sélectionner les colonnes personnalisées d'utilisateur autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Saisir une étiquette"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Ajouter une restriction de visualisation"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Le livre va être supprimé définitivement de la base de données"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "et du disque dur"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Note Kobo importante: les livres supprimés vont rester sur l'appareil Kobo appairé."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Les livres doivent d'abord être archivés et l'appareil synchronisé avant qu'un livre puisse être supprimé en tout sécurité."
+
+#: cps/templates/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"
@@ -2259,99 +2483,99 @@ msgstr "Catalogue de livres électroniques Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Mettre à jour la mise en page du texte quand les bandeaux latéraux sont ouverts."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Mise à l’échelle optimale"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Mise à l’échelle sur la largeur"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Mise à l’échelle sur la hauteur"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Mise à l’échelle d’origine"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Rotation droite"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Rotation gauche"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Inverser l’image"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Clair"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Sombre"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Échelle"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Optimal"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Largeur"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Hauteur"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Origine"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Rotation"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Inverser"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Direction"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "De gauche à droite"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "De droite à gauche"
 
@@ -2403,39 +2627,43 @@ msgstr "Chercher le terme:"
 msgid "Results for:"
 msgstr "Résultats pour :"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Date de publication (depuis)"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Date de publication (jusqu’à)"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Exclure les étiquettes"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Exclure les séries"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Exclure les langues"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Extensions"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Exclure les extensions"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Évaluation supérieure à"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Évaluation inférieure à"
 
@@ -2444,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:67
-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:70
+#: 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"
 
@@ -2467,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"
@@ -2488,8 +2724,8 @@ msgid "Series in this Library"
 msgstr "Séries dans la librairie"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Librairies liées"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2567,19 +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:146
-msgid "Recent Downloads"
-msgstr "Téléchargements récents"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Générer l'URL d'authentification Kobo"
 
-#: cps/templates/user_edit.html:178
-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 08855933..a8f54eaa 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 acccb315..b46f0df0 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,382 +16,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "nincs telepítve"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 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:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Rendszergazda oldala"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 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:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 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:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Ismeretlen hiba történt."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, 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:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, 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:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 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:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 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:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 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:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 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:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr ""
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, 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:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, 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:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 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:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, 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"
@@ -400,184 +445,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "A(z) %(format)s formátum nem található a következő könyvhöz: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Küldés Kindle-re"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nem található: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Küldés Kindle-re"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+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:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web teszt e-mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Teszt e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Kezdő lépések a Calibre-Web-bel"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Regisztrációs e-mail a következő felhasználóhoz: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s küldése Kindle-re"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "A kért fájl nem olvasható. Esetleg jogosultsági probléma lenne?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "A cím átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "A szerző átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "\"%(src)s\" fájl átnevezése \"%(dest)s\"-re nem sikerült a következő hiba miatt: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "A könyv elérési útja (\"%(path)s\") nem található a Google Drive-on"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Nem sikerült"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Elindítva"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Végrehajtva"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail cím: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konvertálás:"
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Feltöltés:"
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Ismeretlen feladat:"
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr ""
 
@@ -586,540 +610,555 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "belépés"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "A token nem található."
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "A token érvényessége lejárt."
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Sikerült! Újra használható az eszköz."
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr ""
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Polc készítése"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Polc szerkesztése"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, 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
-msgid "There was an error"
-msgstr "Hiba történt"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Polc készítése"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "A következő polc megváltoztatva: %(title)s"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Polc szerkesztése"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Hiba történt"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, 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"
+msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:414
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Legutóbb hozzáadott"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Polc: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Legutóbbi könyvek mutatása"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Kelendő könyvek"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Kelendő könyvek mutatása"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Legjobb könyvek"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Legjobbra értékelt könyvek mutatása"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Olvasott könyvek"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Mutassa az olvasva/olvasatlan állapotot"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Olvasatlan könyvek"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr ""
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Felfedezés"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Könyvek találomra mutatása"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Címkék"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Címke választó mutatása"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Sorozatok"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Sorozat választó mutatása"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Szerzők"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Szerző választó mutatása"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Kiadók"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Kiadó választó mutatása"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Nyelvek"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Nyelv választó mutatása"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr ""
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr ""
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr ""
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr ""
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Ismeretlen adat a frissítési információk olvasásakor"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Nem érhető el újabb frissítés. Már a legújabb verzió van telepítve."
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Egy új frissítés érhető el. Kattints a lenti gombra a legújabb verzió frissítésére"
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Nem lehetett begyűjteni a frissítési információkat"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez a következő verzióra: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Legutóbb hozzáadott könyvek"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr ""
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Feladatok"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Keresés"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Kiadva ezután: "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Kiadva ezelőtt: "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Értékelés <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Értékelés <= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "keresés"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Részletes keresés"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Keresés"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Kiadva ezután: "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Kiadva ezelőtt: "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Értékelés <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Értékelés <= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "regisztrálás"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 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:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "belépés"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "A token nem található."
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "A token érvényessége lejárt."
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Sikerült! Újra használható az eszköz."
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Egy olvasott könyv"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Az e-könyv átalakítás nem sikerült: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, 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:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Felhasználók listája"
@@ -1158,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:62
 msgid "Download"
 msgstr "Letöltés"
 
@@ -1171,8 +1209,8 @@ msgid "Edit"
 msgstr "Szerkesztés"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Törlés"
 
@@ -1184,11 +1222,11 @@ msgstr ""
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "SMTP e-mail kiszolgáló beállítások"
 
@@ -1196,145 +1234,150 @@ msgstr "SMTP e-mail kiszolgáló beállítások"
 msgid "SMTP Hostname"
 msgstr "SMTP szervernév"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP felhasználó"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Küldő e-mail cím"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguráció"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Calibre adatbázis mappája:"
 
-#: cps/templates/admin.html:84 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:"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Port:"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Könyvek oldalanként:"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Feltöltés:"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Böngészés bejelentkezés nélkül:"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Nyílvános regisztráció:"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Távoli belépés:"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr ""
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Újracsatlakozás a Calibre adatbázishoz"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "A Calibre adatbázis újraindítása"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "A Calibre adatbázis leállítása"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Frissítés"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Verzió"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Részletek"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Jelenlegi verzió"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Frissítés keresése"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Frissítés elkezdése"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Frissítés folyamatban, ne töltsd újra az oldalt"
 
@@ -1346,20 +1389,44 @@ msgstr "keresztül"
 msgid "In Library"
 msgstr "Könyvtárban"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Több eszerint:"
 
@@ -1391,17 +1458,17 @@ msgstr "Konvertálás erre:"
 msgid "Convert book"
 msgstr "Könyv konvertálása"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Könyv címe"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1409,15 +1476,15 @@ msgstr "Leírás"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1425,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Címkék"
 
@@ -1437,390 +1504,494 @@ msgstr ""
 msgid "Rating"
 msgstr "Értékelés"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Borító URL (jpg, borító letöltve és elmentve az adatbázisban, a mező újra üres lesz utána)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Borító feltöltése helyi meghajtóról"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Kiadás éve"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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ó"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Nyelv"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nem"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Feltöltés formátuma"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Könyv megnézése szerkesztés után"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Biztosan?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "A könyv törölve lesz a Calibre adatbázisból"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr " és a merevlemezről"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Kulcsszó"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Keresési kulcsszó "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Forrás"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Keresési hiba!"
 
-#: cps/templates/book_edit.html:297
+#: 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."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Név"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Biztosan?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Könyvát beállításai"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
-msgid "LDAP Authentication"
-msgstr ""
-
-#: cps/templates/config_edit.html:275
-msgid "Anonymous"
-msgstr ""
-
-#: cps/templates/config_edit.html:276
-msgid "Unauthenticated"
-msgstr ""
-
-#: cps/templates/config_edit.html:277
-msgid "Simple"
-msgstr ""
-
-#: cps/templates/config_edit.html:282
-msgid "LDAP Administrator Username"
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:288
-msgid "LDAP Administrator Password"
-msgstr ""
-
-#: cps/templates/config_edit.html:293
-msgid "LDAP Distinguished Name (DN)"
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:297
-msgid "LDAP User Object Filter"
+msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
-msgid "LDAP Server is OpenLDAP?"
+#: cps/templates/config_edit.html:299
+msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:304
-msgid "Following Settings are Needed For User Import"
+#: cps/templates/config_edit.html:300
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:301
+msgid "Simple"
 msgstr ""
 
 #: cps/templates/config_edit.html:306
+msgid "LDAP Administrator Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:312
+msgid "LDAP Administrator Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:317
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:321
+msgid "LDAP User Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:326
+msgid "LDAP Server is OpenLDAP?"
+msgstr ""
+
+#: cps/templates/config_edit.html:328
+msgid "Following Settings are Needed For User Import"
+msgstr ""
+
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:326
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:330
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Külső futtatható fájlok"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: 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:394 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"
@@ -1829,10 +2000,6 @@ msgstr "Belépés"
 msgid "View Configuration"
 msgstr "Általános beállítások"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Név"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Találomra mutatott könyvek száma"
@@ -1841,7 +2008,7 @@ msgstr "Találomra mutatott könyvek száma"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Mutatott szerzők száma (0=elrejtés kikapcsolása)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Téma"
 
@@ -1975,7 +2142,7 @@ msgstr "Hozzáadás polchoz"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2023,11 +2190,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Következő"
 
@@ -2035,6 +2198,10 @@ msgstr "Következő"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr ""
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr ""
@@ -2043,8 +2210,22 @@ msgstr ""
 msgid "Return to Home"
 msgstr "Vissza a kezdőlapra"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
 msgstr ""
 
 #: cps/templates/index.xml:6
@@ -2115,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Vissza"
 
@@ -2128,12 +2308,8 @@ msgstr "Navigáció átkapcsolása"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Részletes keresés"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -2149,7 +2325,7 @@ msgstr "Kilépés"
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -2161,27 +2337,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Saját polcok"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Könyv részletei"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Hiba"
 
@@ -2213,30 +2385,82 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "A könyv törölve lesz a Calibre adatbázisból"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr " és a merevlemezről"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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"
@@ -2245,99 +2469,99 @@ msgstr "Calibre-Web e-könyv katalógus"
 msgid "Reflow text when sidebars are open."
 msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Előző oldal"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Következő oldal"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Méretezés a legjobbra"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Méretezés a szélességre"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Méretezés a magasságra"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Méretezés a natívra"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Forgatás balra"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Forgatás jobbra"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Kép tükrözése"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Világos"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Sötét"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Méretezés"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Legjobb"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Szélesség"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Magasság"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Natív"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Forgatás"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Tökrözés"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr ""
 
@@ -2389,39 +2613,43 @@ msgstr ""
 msgid "Results for:"
 msgstr "Találatok a következőhöz:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Kiadás éve ettől: "
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Kiadás éve eddig: "
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html: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:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Sorozatok kizárása"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Nyelvek kizárása"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Értékelés nagyob mint"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Értékelés kisebb mint"
 
@@ -2430,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:67
-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:70
+#: 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é!"
 
@@ -2453,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"
@@ -2474,8 +2710,8 @@ msgid "Series in this Library"
 msgstr "Sorozatok ebben a könyvtárban"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Hivatkozott könyvtárak"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2553,19 +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:146
-msgid "Recent Downloads"
-msgstr "Utolsó letöltések"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
-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 18e10d27..6301799f 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 70751467..57eb71f6 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,382 +15,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "installato"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "non installato"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, per favore ricarica la pagina"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Ricollegato con successo"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Vuoi veramente eliminare il token di Kobo?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Vuoi davvero eliminare questo scaffale?"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 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:721
 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:555
+#: cps/admin.py:727
 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:581
+#: cps/admin.py:757
 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:594
+#: cps/admin.py:772
 #, 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:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, 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:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "La posizione del certificato LDAP non è valida, per favore indica il percorso corretto"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP Member User Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "LDAP CACertificate, il certificato o la posizione della chiave non sono corretti, per favore indica il percorso corretto"
+
+#: cps/admin.py:828
 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:634
+#: cps/admin.py:834
 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:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "I parametri del DB non sono scrivibili"
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 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:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Il DB non è scrivibile"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
-msgstr "Creato l'utente '%(user)s'"
+msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
-msgstr "Utente '%(nick)s' eliminato"
+msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 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:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
-msgstr "Ho trovato un account creato in precedenza con questo e-mail."
+msgstr "Ho trovato un account creato in precedenza con questa e-mail."
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
-msgstr "Utente '%(nick)s' aggiornato"
+msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Si è verificato un errore imprevisto."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 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:944
+#: cps/admin.py:1156
 #, 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:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Errore: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Fallita la creazione di almeno un utente LDAP"
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Almeno un utente LDAP non è stato trovato nel database"
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr "{} utente importato con successo"
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "non configurato"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
-msgstr "Mancano i peremssi di esecuzione"
+msgstr "Mancano i permessi di esecuzione"
 
-#: cps/editbooks.py:242
+#: 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:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
-msgstr "Modifica i metadati"
+msgstr "modifica i metadati"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, 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:657
+#: cps/editbooks.py:706
+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:743
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "Probabilmnete il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
+msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Impossibile spostare il file %(file)s: %(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, 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:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
-msgstr "Mancano o il formato sorgente o quello di destinazione, necessari alla conversione"
+msgstr "Mancano o il formato sorgente o quello di destinazione, entrambi necessari alla conversione"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
@@ -399,184 +444,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s non trovato per il libro: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Invia a Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s non trovato: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Invia a Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "E-mail di test da Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "E-mail di test"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Inizia con Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail di registrazione dell'utente: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Invia %(format)s a Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Converti %(orig)s in %(format)s e spedisci a Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Il file richiesto non può essere letto. I permessi sono corretti?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr ""
+msgstr "L'eliminazione della cartella del libro %(id)s non è riuscita, il percorso ha sottocartelle: %(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "L'eliminazione del libro %(id)s non è riuscita: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Eliminazione del libro %(id)s. Il percorso del libro non è valido: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modifica del titolo da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "La modifica dell'autore da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modifica del file nella cartella da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "File %(file)s non trovato su Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Non ho trovato la cartella %(path)s del libro su Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Errore nello scaricare la copertina"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
-msgstr ""
+msgstr "Errore di formato della copertina"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Errore nel creare la cartella per la copertina"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Il file della copertina non è in un formato immagine valido o non può essere salvato"
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg sono supportati per le copertine"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Attendi"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Avviato"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Terminato"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Conversione: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Upload: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Processo sconosciuto: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
-msgstr "Per favore, per ottenere un valido api-endpoint per Kobo, accedi a Calibre-web non da localhost"
+msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Configurazione di Kobo"
 
@@ -585,539 +609,554 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Accesso con GitHub non è riuscito."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 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:162
 msgid "Failed to log in with Google."
 msgstr "L'accesso con Google non è riuscito."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 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:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, 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:229
 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:271
 #, 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:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Scollegamento da  %(oauth)s non riuscito"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr ""
+msgstr "Non collegato a %(oauth)s"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
-msgstr "GitHub errore Oauth, per favore riprova più tardi."
+msgstr "GitHub, errore Oauth: per favore riprova più tardi."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
-msgstr "Google errore Oauth, per favore riprova più tardi."
+msgstr "Google, errore Oauth: per favore riprova più tardi."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "accedi"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Token non trovato"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Il token è scaduto"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Riuscito! Torna al tuo dispositivo"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Libri"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+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:735
+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
-#, 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Crea uno scaffale"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, 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:231
+msgid "Edit a shelf"
+msgstr "Modifica uno scaffale"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Lo scaffale %(title)s è stato creato"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "C'era un errore"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Crea uno scaffale"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Lo scaffale %(title)s è stato modificato"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Modifica uno scaffale"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "C'era un errore"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Scaffale: '%(name)s'"
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Uno scaffale pubblico denominato '%(title)s' esiste già."
 
-#: 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:291
+#, 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:409
-msgid "Hidden Book"
-msgstr "Libro nascosto"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Aggiunti recentemente"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Scaffale: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Mostra l'opzione per la selezione dei libri più recenti"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Libri popolari"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Mostra l'opzione per la selezione dei libri più popolari"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Libri meglio valutati"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Libri da leggere"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Mostra l'opzione per la selezione letto e non letto"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Libri non letti"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Mostra l'opzione per la selezione dei libri non letti"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Per scoprire"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Mostra l'opzione per presentare libri aleatoriamente"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Categorie"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Mostra l'opzione per la selezione delle categorie"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Serie"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Mostra l'opzione per la selezione delle serie"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Autori"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Mostra l'opzione per la selezione degli autori"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Editori"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Mostra l'opzione per la selezione degli editori"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Lingue"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Mostra l'opzione per la selezione delle lingue"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Valutazioni"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Mostra l'opzione per la selezione della valutazione"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Formati file"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Mostra la selezione del formato dei file"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "Libri archiviati"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "Mostra l'opzione per la selezione dei libri archiviati"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Dati inattesi durante il processo di aggiornamento"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
-msgstr "Nessun aggiornamento disponibile. Hai già installata l'ultima versione disponibile"
+msgstr "Nessun aggiornamento disponibile. Hai già installato l'ultima versione"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per aggiornare all'ultima versione."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Impossibile recuperare le informazioni di aggiornamento"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per aggiornare alla versione: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Fallita la creazione di almeno un utente LDAP"
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "Almeno un utente LDAP non è stato trovato nel database"
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr "Utente importato con successo"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Libri aggiunti di recente"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Libri"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "I libri scaricati da %(user)s"
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Elenco delle valutazioni"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Elenco dei formati"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Compito"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Cerca"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Pubblicato dopo "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Pubblicato prima "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Valutazione <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Valutazione >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "ricerca"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonna personale no.%(column)d non esiste nel database di Calibre"
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Ricerca avanzata"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Cerca"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Elenco delle valutazioni"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Elenco dei formati"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Compito"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Pubblicato dopo il "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Pubblicato prima del "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Valutazione <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Valutazione >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "registra"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "Un e-mail di conferma è stato inviato al tuo indirizzo."
+msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
-msgstr "Login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
+msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "accedi"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Token non trovato"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Il token è scaduto"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Riuscito! Torna al tuo dispositivo"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Leggi un libro"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Non ho trovato il convertitore %(tool)s di libri di Calibre"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Errore nel convertitore: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr "Non ho trovato il formato %(format)s nel disco"
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr "La conversione del libro è terminata con un errore sconosciuto"
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Si è verificato un errore con il convertitore Kepubify: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
-msgstr "Non ho trovato il file convertito o più di un file nella cartella %(folder)s"
+msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartella %(folder)s"
+
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Errore nel convertitore: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Si è verificato un errore con Calibre: %(error)s"
 
 #: cps/templates/admin.html:9
 msgid "Users"
@@ -1144,7 +1183,7 @@ msgstr "Downloads"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:77
 msgid "Admin"
-msgstr "Admin"
+msgstr "Amministrazione"
 
 #: cps/templates/admin.html:17 cps/templates/login.html:12
 #: cps/templates/login.html:13 cps/templates/user_edit.html:22
@@ -1157,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:62
 msgid "Download"
 msgstr "Download"
 
@@ -1170,8 +1208,8 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1183,157 +1221,162 @@ msgstr "Scaffale pubblico"
 msgid "Add New User"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "Importa gli utenti LDAP"
 
-#: cps/templates/admin.html:54
+#: 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"
 msgstr "Indirizzo server SMTP"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "Porta SMTP"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
-msgstr "SSL"
+msgstr "Crittografia"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "E-mail da"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Cartella del database di Calibre"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Livello di log"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Porta"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
-msgstr ""
+msgstr "Porta esterna"
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Libri per pagina"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Uploads"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Navigazione anonima"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Registrazione pubblica"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Magic Link Login remoto"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Login reverse proxy"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Nome intestazione reverse proxy"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Edita la configurazione di base"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Edita la configurazione dell'interfaccia utente"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr "Scarica Debug Package"
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Visualizza Logfile"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
-msgstr "Ricollega al database di Calibre"
+msgstr "Ricollega il database di Calibre"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Riavvia Calibre-Web"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Arresta Calibre-Web"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Aggiornamento"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Versione"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Dettagli"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Versione attuale"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Esegui l'aggiornamento"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Vuoi veramente arrestare Calibre-Web?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -1345,20 +1388,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "Nella libreria"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Tutti"
+#: 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 "Ordina secondo la data dei libri, prima i più recenti"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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 "Ordina secondo la data dei libri, prima i più vecchi"
+
+#: 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 "Ordina i titoli in ordine alfabetico"
+
+#: 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 "Ordina i titoli in ordine alfabetico inverso"
+
+#: 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 "Ordina secondo la data di pubblicazione, prima i più recenti"
+
+#: 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 "Ordina secondo la data di pubblicazione, prima i più vecchi"
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Altro da"
 
@@ -1390,17 +1457,17 @@ msgstr "Converti in:"
 msgid "Convert book"
 msgstr "Converti libro"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Titolo del libro"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1408,15 +1475,15 @@ msgstr "Descrizione"
 msgid "Identifiers"
 msgstr "Identificatori"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1424,7 +1491,7 @@ msgstr "Rimuovi"
 msgid "Add Identifier"
 msgstr "Aggiungi un identificatore"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Categorie"
 
@@ -1436,390 +1503,494 @@ msgstr "ID della serie"
 msgid "Rating"
 msgstr "Valutazione"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
-msgstr "Carica la copertina da URL (jpg, la copertina viene caricata e salvata nel database)"
+msgstr "Carica la copertina da URL (jpg - L'immagine della copertina viene scaricata e salvata nel database)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Carica la copertina dal disco locale"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Data di pubblicazione"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Lingua"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Carica formato"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
-msgstr "visualizza il libro dopo la modifica"
+msgstr "Visualizza il libro dopo la modifica"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Sei davvero sicuro?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Il libro verrà cancellato dal database di Calibre"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "e dal disco rigido"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Oservazione importante riguardo Kobo: i libri eliminati, rimarranno in ogni lettore Kobo accoppiato."
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Prima di poter elimnare in sicurezza un libro, prima occorre che il libro venga archiviato e che l'apparecchio venga sincronizzato."
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " ricerca parola chiave "
 
-#: cps/templates/book_edit.html:240
+#: 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 presenti nel modulo"
+msgstr "Fai clic sulla copertina per caricare i metadati nel modulo"
 
-#: cps/templates/book_edit.html:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
-msgstr "Errore di ricerca!"
+msgstr "Errore nella ricerca!"
 
-#: cps/templates/book_edit.html:297
+#: 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."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "Questo campo è obbligatorio"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "Unisci i libri selezionati"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "Rimuovi le selezioni"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "Aggiorna automaticamente l'ordinamento dei titoli"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "Aggiorna automaticamente l'ordinamento degli autori"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "Indica il titolo"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titolo"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr "Indica l'ordinamento del titolo"
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr "Ordinamento del titolo"
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr "Indica l'ordinamento dell'autore"
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr "Ordinamento dell'autore"
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr "Indica gli autori"
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr "Indica le categorie"
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr "Indica le serie"
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr "Indica il titolo"
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr "Indice delle serie"
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr "Indica le lingue"
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr "Data di pubblicazione"
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr "Indica gli editori"
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Sei veramente sicuro?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr "I libri con il titolo vengono uniti da:"
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr "Nel libro con il titolo:"
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "Unisci"
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Configurazione della libreria"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 msgid "Location of Calibre Database"
 msgstr "Posizione del database di Calibre"
 
-#: cps/templates/config_edit.html:28
-msgid "Use Google Drive?"
-msgstr "Utilizzo Google Drive?"
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f option"
+msgstr ""
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:35
+msgid "Use Google Drive?"
+msgstr "Utilizza Google Drive"
+
+#: 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 Certfile SSL (lascia vuoto per una configurazione del server senza SSL)"
-
 #: cps/templates/config_edit.html:100
-msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
-msgstr "Percorso del Keyfile SSL (lascia vuoto per una configurazione del server senza SSL)"
+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:108
+#: 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: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 ""
+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 "Cifratura LDAP"
+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:268
-msgid "LDAP Certificate Path"
-msgstr "Cartella del certificato LDAP"
+#: cps/templates/config_edit.html:274
+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:273
+#: cps/templates/config_edit.html:281
+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: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:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Non autenticato"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Semplice"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nome di utente dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Password dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:297
+#: 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:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
-msgstr "Il server LDAP è un server OpenLDAP?"
+msgstr "Il server LDAP è un server OpenLDAP."
 
-#: cps/templates/config_edit.html:304
+#: 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:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "LDAP Group Object Filter"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP Group Name"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP Group Members Field"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr "LDAP Member User Filter Detection"
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr "Autodetect"
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr "Filtro personalizzato"
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr "LDAP Member User Filter"
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Files binari esterni"
 
-#: cps/templates/config_edit.html:352
+#: 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:360
+#: 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:363
+#: 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:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Percorso del file binario di UnRar"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1828,10 +1999,6 @@ msgstr "Accesso"
 msgid "View Configuration"
 msgstr "Configurazione aspetto biblioteca"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titolo"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Numero di libri casuali da mostrare"
@@ -1840,7 +2007,7 @@ msgstr "Numero di libri casuali da mostrare"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Numero di autori da mostrare prima di nascondere (0=disabilita mascheramento)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Tema"
 
@@ -1962,7 +2129,7 @@ msgstr "Aggiungi all'archivio"
 
 #: cps/templates/detail.html:218
 msgid "Archived"
-msgstr "da archiviare"
+msgstr "Archiviato"
 
 #: cps/templates/detail.html:229
 msgid "Description:"
@@ -1974,7 +2141,7 @@ msgstr "Aggiungi allo scaffale"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Pubblico)"
 
@@ -2022,11 +2189,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Prossimo"
 
@@ -2034,17 +2197,35 @@ msgstr "Prossimo"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Apri il file .kobo/Kobo eReader.conf in un editore di testi e aggiungi (o edita):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Tutti"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
-msgstr "Crea-segnala un problema"
+msgstr "Crea un rapporto di segnalazione di un problema"
 
 #: cps/templates/http_error.html:45
 msgid "Return to Home"
 msgstr "Ritorna alla pagina principale"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Raggruppa per serie"
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
+msgid "Sort authors in alphabetical order"
+msgstr "Ordina gli autori in ordine alfabetico"
+
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr "Ordina gli autori in ordine alfabetico inverso"
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr "Ordina in ordine ascendente secondo l'indice della serie"
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr "Ordina in ordine discendente secondo l'indice della serie"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2052,11 +2233,11 @@ msgstr "Inizio"
 
 #: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
-msgstr "Pubblicazioni popolari di questo catalogo in base ai download."
+msgstr "Pubblicazioni popolari in questo catalogo in base ai download."
 
 #: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
-msgstr "Pubblicazioni popolari di questo catalogo in base alle valutazioni."
+msgstr "Pubblicazioni popolari in questo catalogo in base alle valutazioni."
 
 #: cps/templates/index.xml:31
 msgid "Recently added Books"
@@ -2114,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Indietro"
 
@@ -2127,12 +2307,8 @@ msgstr "Alterna navigazione"
 msgid "Search Library"
 msgstr "Ricerca nella libreria"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Ricerca avanzata"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurazione"
 
@@ -2148,7 +2324,7 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registra"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Uploading..."
 
@@ -2160,27 +2336,23 @@ msgstr "Per favore non ricaricare la pagina"
 msgid "Browse"
 msgstr "Naviga"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "I tuoi scaffali"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Errore"
 
@@ -2212,30 +2384,82 @@ msgstr "Flusso attivo, non può essere visualizzato"
 msgid "Show Access Log: "
 msgstr "Mostra il log di accesso: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Scarica il log di Calibre-Web"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Scarica il log di accesso"
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Seleziona le categorie consentite/negate"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Seleziona i valori personali consentiti/negati per le colonne"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Seleziona le categorie consentite/negate per l'utente"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Seleziona i valori personali consentiti/negati per le colonne dell'utente"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
-msgstr "Digita categorie"
+msgstr "Indica le categorie"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Aggiungi restrizioni di visualizzazione"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Questo formato di libro viene rimosso definitivamente dal database"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Il libro verrà cancellato dal database di Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "e dal disco rigido"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Oservazione importante riguardo a Kobo: i libri eliminati, rimarranno in ogni lettore Kobo accoppiato."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Prima di poter eliminare in sicurezza un libro, occorre che il libro venga archiviato e che l'apparecchio venga sincronizzato."
+
+#: cps/templates/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"
@@ -2244,99 +2468,99 @@ msgstr "Catalogo Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Adatta il testo quando le barre laterali sono aperte."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie della tastiera"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Pagina precedente"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Pagina successiva"
 
-#: cps/templates/readcbr.html:93
-msgid "Scale to Best"
-msgstr "Adatta al migliore"
-
 #: cps/templates/readcbr.html:94
+msgid "Scale to Best"
+msgstr "Adatta al meglio"
+
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Adatta alla larghezza"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Adatta all'altezza"
 
-#: cps/templates/readcbr.html:96
-msgid "Scale to Native"
-msgstr "Dimensione originale"
-
 #: cps/templates/readcbr.html:97
+msgid "Scale to Native"
+msgstr "Scala alla dimensione originale"
+
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Capovolgi immagine"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Chiaro"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Scuro"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Scala"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Migliore"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Larghezza"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Altezza"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Originale"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Ruota"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Capovolgi"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Verticale"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Orientamento"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Da sinistra a destra"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Da destra a sinistra"
 
@@ -2378,7 +2602,7 @@ msgstr "Il link scadrà tra 10 minuti."
 
 #: cps/templates/search.html:5
 msgid "No Results Found"
-msgstr "Nessun risultato"
+msgstr "Nessun risultato trovato"
 
 #: cps/templates/search.html:6
 msgid "Search Term:"
@@ -2386,41 +2610,45 @@ msgstr "Termine di ricerca:"
 
 #: cps/templates/search.html:8
 msgid "Results for:"
-msgstr "risultati per:"
+msgstr "Risultati per:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Data di pubblicazione da"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Data di pubblicazione fino a"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Escludi categorie"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Escludi serie"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Escludi lingue"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Estensioni"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Escludi estensioni"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Valutazione superiore a"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Valutazione inferiore a"
 
@@ -2429,20 +2657,24 @@ msgid "Delete this Shelf"
 msgstr "Cancella questo scaffale"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Modifica 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:67
-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:70
+#: 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 sarà perso per tutti e per sempre!"
+msgstr "Lo scaffale verrà eliminato per tutti gli utenti"
 
 #: cps/templates/shelf_edit.html:13
 msgid "Share with Everyone"
@@ -2452,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"
@@ -2473,8 +2709,8 @@ msgid "Series in this Library"
 msgstr "Serie in questa libreria"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Librerie collegate"
+msgid "System Statistics"
+msgstr "Statistiche del sistema"
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2518,7 +2754,7 @@ msgstr "Nascondi tutte le operazioni"
 
 #: cps/templates/user_edit.html:19
 msgid "Reset user Password"
-msgstr "Resetta la password dell'utente"
+msgstr "Reimposta la password dell'utente"
 
 #: cps/templates/user_edit.html:42
 msgid "Language of Books"
@@ -2552,19 +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:146
-msgid "Recent Downloads"
-msgstr "Download recenti"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Genera un URL di autenticazione per Kobo"
 
-#: cps/templates/user_edit.html:178
-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 3ceeda92..aa14daa9 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 0bddaacc..a821a302 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,382 +16,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "インストールされていません"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました。ページを再読み込みしてください"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンしています。ページを閉じてください"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "不明"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "不明なエラーが発生しました。"
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "テストメールが %(kindlemail)s に送信されました"
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr ""
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません"
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/editbooks.py:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
@@ -400,184 +445,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "ID: %(book)d の本に %(format)s フォーマットはありません"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Kindleに送信"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "このメールはCalibre-Web経由で送信されました。"
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s がありません: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Kindleに送信"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "このメールはCalibre-Web経由で送信されました。"
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web テストメール"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "テストメール"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Webを始める"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "ユーザ: %(name)s 用の登録メール"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Kindleに %(format)s を送信"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s を %(format)s に変換してからKindleに送信"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "メール: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした。"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、著者名を %(src)s から %(dest)s に変更できませんでした。"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "エラー: %(error)s により、ファイルパスを %(src)s から %(dest)s に変更できませんでした。"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "待機中"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "開始"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "終了"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "不明"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "メール: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "変換: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "アップロード: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "不明なタスク: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr ""
 
@@ -586,540 +610,555 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "ログイン"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "トークンが見つかりません"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "トークンが無効です"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "成功です！端末に戻ってください"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "本棚を作成する"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "本棚を編集する"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s を作成しました"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "エラーが発生しました"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "本棚を作成する"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s を変更しました"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "本棚を編集する"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "エラーが発生しました"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, 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"
+msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:414
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "最近追加した本"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "本棚: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "最近追加された本を表示"
+#: cps/shelf.py:427
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "人気の本"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr ""
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr ""
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr ""
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "読んだ本"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "既読の本と未読の本を表示"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "未読の本"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr ""
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "見つける"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "ランダムで本を表示"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "カテゴリ"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "カテゴリ選択を表示"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "シリーズ"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "シリーズ選択を表示"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "著者"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "著者選択を表示"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "出版社"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "出版社選択を表示"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "言語"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "言語選択を表示"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr ""
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr ""
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr ""
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr ""
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "アップデートはありません。すでに最新バージョンがインストールされています"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "アップデートが利用可能です。下のボタンをクリックして最新バージョンにアップデートしてください。"
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "アップデート情報を取得できません"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "アップデートが利用可能です。下のボタンをクリックしてバージョン: %(version)s にアップデートしてください。"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "最近追加された本"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr ""
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "タスク"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "検索"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "これ以降に出版 "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "これ以前に出版 "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "評価 <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "評価 >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "検索"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "詳細検索"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "検索"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "タスク"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "これ以降に出版 "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "これ以前に出版 "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "評価 <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "評価 >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1308
+#: cps/web.py:1250
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr "このユーザ名またはメールアドレスはすでに使われています。"
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "ログイン"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "トークンが見つかりません"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "トークンが無効です"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "成功です！端末に戻ってください"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Ebook-converter が失敗しました: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ebook-converter が失敗しました: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1158,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:62
 msgid "Download"
 msgstr "ダウンロード"
 
@@ -1171,8 +1209,8 @@ msgid "Edit"
 msgstr "編集"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "削除"
 
@@ -1184,11 +1222,11 @@ msgstr ""
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr ""
 
@@ -1196,145 +1234,150 @@ msgstr ""
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "暗号化"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "設定"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "ログレベル"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "ポート番号"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr ""
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "アップデート"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "バージョン"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "詳細"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "現在のバージョン"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "更新を実行"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1346,20 +1389,44 @@ msgstr "経由"
 msgid "In Library"
 msgstr "ライブラリ内"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr ""
 
@@ -1391,17 +1458,17 @@ msgstr "変換先:"
 msgid "Convert book"
 msgstr "本を変換"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "本のタイトル"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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 "詳細"
 
@@ -1409,15 +1476,15 @@ msgstr "詳細"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1425,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "タグ"
 
@@ -1437,390 +1504,494 @@ msgstr ""
 msgid "Rating"
 msgstr "評価"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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 "出版社"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "言語"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "いいえ"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "よろしいですか?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr ""
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr ""
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "キーワード"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "キーワードを検索"
 
-#: cps/templates/book_edit.html:240
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "カバー画像をクリックしてメタデータをフォームに読み込んでください"
 
-#: cps/templates/book_edit.html:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "ソース"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "検索エラー"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "検索結果が見つかりません。別のキーワードで検索してみてください。"
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "タイトル"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "よろしいですか?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "ライブラリ設定"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
-msgid "LDAP Authentication"
-msgstr ""
-
-#: cps/templates/config_edit.html:275
-msgid "Anonymous"
-msgstr ""
-
-#: cps/templates/config_edit.html:276
-msgid "Unauthenticated"
-msgstr ""
-
-#: cps/templates/config_edit.html:277
-msgid "Simple"
-msgstr ""
-
-#: cps/templates/config_edit.html:282
-msgid "LDAP Administrator Username"
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:288
-msgid "LDAP Administrator Password"
-msgstr ""
-
-#: cps/templates/config_edit.html:293
-msgid "LDAP Distinguished Name (DN)"
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:297
-msgid "LDAP User Object Filter"
+msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
-msgid "LDAP Server is OpenLDAP?"
+#: cps/templates/config_edit.html:299
+msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:304
-msgid "Following Settings are Needed For User Import"
+#: cps/templates/config_edit.html:300
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:301
+msgid "Simple"
 msgstr ""
 
 #: cps/templates/config_edit.html:306
+msgid "LDAP Administrator Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:312
+msgid "LDAP Administrator Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:317
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:321
+msgid "LDAP User Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:326
+msgid "LDAP Server is OpenLDAP?"
+msgstr ""
+
+#: cps/templates/config_edit.html:328
+msgid "Following Settings are Needed For User Import"
+msgstr ""
+
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:326
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:330
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "外部バイナリ"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrarバイナリのパス"
 
-#: cps/templates/config_edit.html:394 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 "ログイン"
@@ -1829,10 +2000,6 @@ msgstr "ログイン"
 msgid "View Configuration"
 msgstr "表示設定"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "タイトル"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr ""
@@ -1841,7 +2008,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "テーマ"
 
@@ -1975,7 +2142,7 @@ msgstr "本棚に追加"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2023,11 +2190,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "次"
 
@@ -2035,6 +2198,10 @@ msgstr "次"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr ""
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr ""
@@ -2043,8 +2210,22 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
-msgid "Group by series"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
 msgstr ""
 
 #: cps/templates/index.xml:6
@@ -2115,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "ホーム"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "戻る"
 
@@ -2128,12 +2308,8 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "詳細検索"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設定"
 
@@ -2149,7 +2325,7 @@ msgstr "ログアウト"
 msgid "Register"
 msgstr "登録"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -2161,27 +2337,23 @@ msgstr ""
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "あなたの本棚"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "本の詳細"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "エラー"
 
@@ -2213,30 +2385,82 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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 ""
@@ -2245,99 +2469,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "前のページ"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "次のページ"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "最適なサイズにする"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "オリジナルのサイズにする"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "右に回転する"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "左に回転する"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "画像を反転する"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "ライト"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "ダーク"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "サイズ"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "最適"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "オリジナル"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "回転"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "反転"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "水平方向"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "垂直方向"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "読む方向"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "左から右"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "右から左"
 
@@ -2389,39 +2613,43 @@ msgstr ""
 msgid "Results for:"
 msgstr "結果:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr ""
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "タグを除外"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "シリーズを除外"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "言語を除外"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2430,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:67
-msgid "Are you sure you want to delete this shelf?"
+msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:70
+#: 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 ""
 
@@ -2453,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 ""
@@ -2474,7 +2710,7 @@ msgid "Series in this Library"
 msgstr "このライブラリ内のシリーズ"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
+msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
@@ -2553,19 +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:146
-msgid "Recent Downloads"
-msgstr "最近のダウンロード"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
-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 308431b7..4cf29136 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 d29d3d2c..658902d1 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,382 +17,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "មិនបានតម្លើង"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr ""
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/editbooks.py:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -401,184 +446,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:89
+#: cps/helper.py:86 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "ផ្ញើទៅ Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "ផ្ញើទៅ Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "អ៊ីមែល៖ %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "ប្តូរចំណងជើងពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "ប្តូរអ្នកនិពន្ធពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr ""
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr ""
 
@@ -587,540 +611,555 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "ចូលប្រើ"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "រកមិនឃើញវត្ថុតាង"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "វត្ថុតាងហួសពេលកំណត់"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "បង្កើតធ្នើ"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "កែប្រែធ្នើ"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "មានបញ្ហា"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "បង្កើតធ្នើ"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "កែប្រែធ្នើ"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, 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"
+msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:414
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "ទើបបន្ថែមថ្មីៗ"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "បង្ហាញសៀវភៅមកថ្មី"
+#: cps/shelf.py:427
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "សៀវភៅដែលមានប្រជាប្រិយភាព"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "បង្ហាញសៀវភៅដែលមានប្រជាប្រិយភាព"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "សៀវភៅដែលបានអានរួច"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "សៀវភៅដែលមិនទាន់បានអាន"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr ""
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "ស្រាវជ្រាវ"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "បង្ហាញសៀវភៅចៃដន្យ"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "ប្រភេទនានា"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "បង្ហាញជម្រើសប្រភេទ"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "ស៊េរី"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "បង្ហាញជម្រើសស៊េរី"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "អ្នកនិពន្ធ"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr ""
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr ""
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "ភាសានានា"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "បង្ហាញផ្នែកភាសា"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr ""
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr ""
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr ""
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr ""
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "សៀវភៅដែលទើបបានបន្ថែម"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr ""
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "កិច្ចការនានា"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "ស្វែងរក"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "បានបោះពុម្ភក្រោយ  "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "បានបោះពុម្ភមុន  "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "ការវាយតម្លៃ <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "ការវាយតម្លៃ >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "ស្វែងរក"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "ស្វែងរកកម្រិតខ្ពស់"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "ស្វែងរក"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "កិច្ចការនានា"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "បានបោះពុម្ភក្រោយ  "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "បានបោះពុម្ភមុន  "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "ការវាយតម្លៃ <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "ការវាយតម្លៃ >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1308
+#: cps/web.py:1250
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "ចូលប្រើ"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "រកមិនឃើញវត្ថុតាង"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "វត្ថុតាងហួសពេលកំណត់"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "បញ្ជីអ្នកប្រើប្រាស់"
@@ -1159,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:62
 msgid "Download"
 msgstr "ទាញយក"
 
@@ -1172,8 +1210,8 @@ msgid "Edit"
 msgstr "កែប្រែ"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "លុប"
 
@@ -1185,11 +1223,11 @@ msgstr ""
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr ""
 
@@ -1197,145 +1235,150 @@ msgstr ""
 msgid "SMTP Hostname"
 msgstr "ឈ្មោះម៉ាស៊ីន SMTP"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "លេខ port SMTP"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "អ្នកចូលប្រើ SMTP"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "ពីអ៊ីមែល"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "ការកំណត់"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "ទីតាំង database Calibre"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "លេខ port"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "ចំនួនសៀវភៅក្នុងមួយទំព័រ"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "កំពុងអាប់ឡូដ"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "ការចុះឈ្មាះសាធារណៈ"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "ការចូលប្រើប្រាស់ពីចម្ងាយ"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr ""
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "កិច្ចការរដ្ឋបាល"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "ភ្ជាប់ទៅ database Calibre ម្តងទៀត"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "រកមើលបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "ធ្វើបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "កំពុងធ្វើបច្ចុប្បន្នភាព សូមកុំបើកទំព័រជាថ្មី"
 
@@ -1347,20 +1390,44 @@ msgstr "តាមរយៈ"
 msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "បន្ថែមទៀតដោយ"
 
@@ -1392,17 +1459,17 @@ msgstr ""
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "ចំណងជើងសៀវភៅ"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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 "ពិពណ៌នា"
 
@@ -1410,15 +1477,15 @@ msgstr "ពិពណ៌នា"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1426,7 +1493,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Tag"
 
@@ -1438,390 +1505,494 @@ msgstr "លេខសម្គាល់ស៊េរី"
 msgid "Rating"
 msgstr "ការវាយតម្លៃ"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "ថ្ងៃបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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 "អ្នកបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "ភាសា"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "ទេ"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "ទម្រង់អាប់ឡូដ"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr ""
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "និងពីថាសរឹង"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "ពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:240
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
 
-#: cps/templates/book_edit.html:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "ប្រភព"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "ការស្វែងរកមានកំហុស!"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "ចំណងជើង"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr ""
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "ការកំណត់បណ្ណាល័យ"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
-msgid "LDAP Authentication"
-msgstr ""
-
-#: cps/templates/config_edit.html:275
-msgid "Anonymous"
-msgstr ""
-
-#: cps/templates/config_edit.html:276
-msgid "Unauthenticated"
-msgstr ""
-
-#: cps/templates/config_edit.html:277
-msgid "Simple"
-msgstr ""
-
-#: cps/templates/config_edit.html:282
-msgid "LDAP Administrator Username"
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:288
-msgid "LDAP Administrator Password"
-msgstr ""
-
-#: cps/templates/config_edit.html:293
-msgid "LDAP Distinguished Name (DN)"
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:297
-msgid "LDAP User Object Filter"
+msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
-msgid "LDAP Server is OpenLDAP?"
+#: cps/templates/config_edit.html:299
+msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:304
-msgid "Following Settings are Needed For User Import"
+#: cps/templates/config_edit.html:300
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:301
+msgid "Simple"
 msgstr ""
 
 #: cps/templates/config_edit.html:306
+msgid "LDAP Administrator Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:312
+msgid "LDAP Administrator Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:317
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:321
+msgid "LDAP User Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:326
+msgid "LDAP Server is OpenLDAP?"
+msgstr ""
+
+#: cps/templates/config_edit.html:328
+msgid "Following Settings are Needed For User Import"
+msgstr ""
+
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:326
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:330
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:394 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 "ចូលប្រើប្រាស់"
@@ -1830,10 +2001,6 @@ msgstr "ចូលប្រើប្រាស់"
 msgid "View Configuration"
 msgstr "មើលការកំណត់"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "ចំណងជើង"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "ចំនួនសៀវភៅចៃដន្យដើម្បីបង្ហាញ"
@@ -1842,7 +2009,7 @@ msgstr "ចំនួនសៀវភៅចៃដន្យដើម្បីបង
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "ការតុបតែង"
 
@@ -1976,7 +2143,7 @@ msgstr "បន្ថែមទៅធ្នើ"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2024,11 +2191,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "បន្ទាប់"
 
@@ -2036,6 +2199,10 @@ msgstr "បន្ទាប់"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr ""
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr ""
@@ -2044,8 +2211,22 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
-msgid "Group by series"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
 msgstr ""
 
 #: cps/templates/index.xml:6
@@ -2116,8 +2297,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "មកក្រោយ"
 
@@ -2129,12 +2309,8 @@ msgstr "បិទ/បើកការរុករក"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "ស្វែងរកកម្រិតខ្ពស់"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "ការកំណត់"
 
@@ -2150,7 +2326,7 @@ msgstr "ចេញពីការប្រើប្រាស់"
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
@@ -2162,27 +2338,23 @@ msgstr ""
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "ធ្នើរបស់អ្នក"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr ""
 
@@ -2214,30 +2386,82 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "និងពីថាសរឹង"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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 ""
@@ -2246,99 +2470,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំងចំហៀង។"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr ""
 
@@ -2390,39 +2614,43 @@ msgstr ""
 msgid "Results for:"
 msgstr "លទ្ធផលសម្រាប់៖"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "ថ្ងៃបោះពុម្ភចាប់ពី"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "ថ្ងៃបោះពុម្ភរហូតដល់"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "លើកលែង tag"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "លើកលែងស៊េរី"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "លើកលែងភាសា"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "ការវាយតម្លៃលើសពី"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "ការវាយតម្លៃតិចជាង"
 
@@ -2431,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:67
-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:70
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "ធ្នើនេះនឹងបាត់បង់ជាអចិន្ត្រៃយ៍សម្រាប់គ្រប់គ្នា!"
 
@@ -2454,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"
@@ -2475,8 +2711,8 @@ msgid "Series in this Library"
 msgstr "ស៊េរីនានាក្នុងបណ្ណាល័យនេះ"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "បណ្ណាល័យដែលមានទំនាក់ទំនង"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2554,19 +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:146
-msgid "Recent Downloads"
-msgstr "ការទាញយកថ្មីៗ"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
-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 eda44f20..9e2f2e01 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 b105b2f6..9b5c9452 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-01 20:17+0200\n"
-"PO-Revision-Date: 2020-05-10 21:00+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
+"PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
 "Language-Team: ed.driesen@telenet.be\n"
@@ -17,382 +17,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "geïnstalleerd"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "De server is herstart, vernieuw de pagina"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met afsluiten van de server, sluit het venster"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Opnieuw verbinden gelukt"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Systeembeheer"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Wil je werkelijk je Kobo Token verwijderen?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 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:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 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:721
 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:555
+#: cps/admin.py:727
 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:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "LDAP certificaatlocatie is onjuist, voer een geldige locatie in"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-sleutellocatie is niet geldig, voer een geldige locatie in"
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldige locatie in"
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "Instellingen niet opgeslagen"
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Database niet gevonden, voer de juiste locatie in"
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
-msgstr ""
+msgstr "Kan niet schrijven naar database"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-mail verstuurd naar %(kindlemail)s"
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Fout: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Fout: No user returned in response of LDAP server"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "niet geconfigureerd"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
-msgstr ""
+msgstr "Kan programma niet uitvoeren"
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Het boekformaat is verwijderd"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
-msgstr ""
+msgstr "Database fout: %(error)s."
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "Identificatoren zijn niet hoofdlettergevoelig, overschrijf huidige identificatoren"
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken, controleer het logbestand"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Bestand %(file)s niet verplaatst: %(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Omslag %(file)s niet verplaatst: %(error)s"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, 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"
@@ -401,184 +446,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formaat niet gevonden voor boek met id: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Versturen naar Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Deze e-mail is verstuurd via Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s niet gevonden %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Versturen naar Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Deze e-mail is verstuurd via Calibre-Web."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web - test-e-mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Test-e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Aan de slag met Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registratie-e-mailadres van gebruiker: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s versturen naar Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s converteren naar %(format)s en versturen naar Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Het opgevraagde bestand kan niet worden uitgelezen. Ben je hiertoe gemachtigd?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Verwijderen van boek %(id)s mislukt: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de naam '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Kan de auteursnaam '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan het bestand in '%(src)s' niet wijzigen naar '%(dest)s': %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
-msgstr ""
+msgstr "Fout bij downloaden omslag"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
-msgstr ""
+msgstr "Onjuist omslag formaat"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Locatie aanmaken voor omslag mislukt"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Omslag-bestand is geen afbeelding of kon niet opgeslagen worden"
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Alleen jpg/jpeg bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Wachten"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mailadres: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Converteren: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Uploaden: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Onbekende taak: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Je kunt Calibre-Web niet vanaf de lokale computer openen om een geldige api_endpoint te krijgen voor je kobo toestel"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Kobo Instellen"
 
@@ -587,540 +611,555 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Inloggen bij GitHub mislukt."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Opvragen gebruikersinfo bij GitHub mislukt."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Inloggen bij Google mislukt."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Opvragen gebruikersinfo bij Google mislukt."
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Koppeling gemaakt met %(oauth)s"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 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:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Koppeling met %(oauth)s verbroken"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Ontkoppelen van %(oauth)s mislukt"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 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:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "inloggen"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Toegangssleutel niet gevonden"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Toegangssleutel is verlopen"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Gelukt! Ga terug naar je apparaat"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Boeken"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+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:735
+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
-#, 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Boekenplank maken"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, 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:231
+msgid "Edit a shelf"
+msgstr "Pas een boekenplank aan"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' aangemaakt"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Er is een fout opgetreden"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Boekenplank maken"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Pas een boekenplank aan"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Boekenplank: '%(name)s'"
+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: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:291
+#, 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:409
-msgid "Hidden Book"
-msgstr "Verborgen boek"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde bewerken van boekenplank: '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Recent toegevoegd"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Boekenplank: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Recent toegevoegde boeken tonen"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Populaire boeken"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Populaire boeken tonen"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Best beoordeelde boeken"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Best beoordeelde boeken tonen"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Gelezen boeken"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Gelezen/Ongelezen boeken tonen"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Ongelezen boeken"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Ongelezen boeken tonen"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Willekeurige boeken"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Willekeurige boeken tonen"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Categorieën"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Categoriekeuze tonen"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Boekenreeksen"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Boekenreeksenkeuze tonen"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Auteurs"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Auteurkeuze tonen"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Uitgevers"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Uitgeverskeuze tonen"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Talen"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Taalkeuze tonen"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Beoordelingen"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Beoordelingen tonen"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Bestandsformaten"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Bestandsformaten tonen"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "Gearchiveerde boeken"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "Gearchiveerde boeken tonen"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Onverwachte gegevens tijdens het uitlezen van de update-informatie"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Er is geen update beschikbaar."
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar de nieuwste versie."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "De update-informatie kan niet worden opgehaald"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Geen update-informatie beschikbaar"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar versie: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klik op onderstaande knop om de laatste stabiele versie te installeren."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr "Gebruiker is geïmporteerd"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Recent toegevoegde boeken"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Boeken"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Gedownloade boeken door %(user)s"
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Beoordelingen"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Alle bestandsformaten"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Taken"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Zoeken"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Gepubliceerd na "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Gepubliceerd vóór "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Beoordeling <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Beoordeling >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "zoeken"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Geavanceerd zoeken"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Zoeken"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Beoordelingen"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Alle bestandsformaten"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Taken"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Gepubliceerd na "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Gepubliceerd vóór "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Beoordeling <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Beoordeling >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "registreren"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 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:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr "Gebruikersnaam of e-mailadres is al in gebruik."
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "inloggen"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Toegangssleutel niet gevonden"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Toegangssleutel is verlopen"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Gelukt! Ga terug naar je apparaat"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "E-boek-conversie mislukt: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "E-boek-conversie mislukt: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Gebruikerslijst"
@@ -1159,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:62
 msgid "Download"
 msgstr "Downloaden"
 
@@ -1172,24 +1210,24 @@ msgid "Edit"
 msgstr "Bewerken"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Verwijderen"
 
 #: cps/templates/admin.html:23
 msgid "Public Shelf"
-msgstr ""
+msgstr "Openbare boekenplank"
 
 #: cps/templates/admin.html:44
 msgid "Add New User"
 msgstr "Gebruiker toevoegen"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "LDAP gebruikers importeren"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "SMTP-serverinstellingen"
 
@@ -1197,145 +1235,150 @@ msgstr "SMTP-serverinstellingen"
 msgid "SMTP Hostname"
 msgstr "SMTP-hostnaam (gebruik mail.example.org om wachtwoordherstel uit te schakelen)"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP-poort"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "Encryptie"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP-gebruikersnaam"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Van e-mail"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Instellingen"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Calibre-database locatie"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Logniveau"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Poort"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
-msgstr ""
+msgstr "Externe poort"
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Aantal boeken per pagina"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Uploaden toestaan"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Anoniem verkennen"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Openbare registratie"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Inloggen op afstand"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Reverse Proxy Login"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Reverse proxy header naam"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Bewerk basis configuratie"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Bewerk gebruikersinterface configuratie"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Systeembeheer"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr "Download foutopsporingspakket"
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Logboeken bekijken"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Opnieuw verbinden met Calibre database"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Calibre-Web herstarten"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Calibre-Web stoppen"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Bijwerken"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Versie"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Huidige versie"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Controleren op updates"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Update uitvoeren"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Oké"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Weet je zeker dat je Calibre-Web wilt stoppen?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Bezig met bijwerken, vernieuw de pagina niet"
 
@@ -1347,20 +1390,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "In bibliotheek"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Alles"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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: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: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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Meer van"
 
@@ -1392,17 +1459,17 @@ msgstr "Converteren naar:"
 msgid "Convert book"
 msgstr "Boek converteren"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Boektitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1410,15 +1477,15 @@ msgstr "Omschrijving"
 msgid "Identifiers"
 msgstr "Identificatoren"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1426,7 +1493,7 @@ msgstr "Verwijderen"
 msgid "Add Identifier"
 msgstr "Identificator toevoegen"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Labels"
 
@@ -1438,390 +1505,494 @@ msgstr "Boekenreeks volgnummer"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Omslag-url (jpg) (de omslag wordt gedownload en opgeslagen in de database)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Omslag uploaden vanaf de harde schijf"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Publicatiedatum"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nee"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Uploadformaat"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Boek inkijken na bewerking"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Weet je het zeker?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Het boek wordt verwijderd uit de Calibre-database"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "en van de harde schijf"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Trefwoord"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Trefwoord zoeken "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Zoekfout!"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Geen resultaten gevonden! Gebruik een ander trefwoord."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "Dit veld is verplicht"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "Geselecteerde boeken samenvoegen"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "Geselecteerde boeken verwijderen"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "Automatisch sorteren op titel"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "Automatisch sorteren op auteur"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "Geef titel"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Weet je het zeker?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "Samenvoegen"
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Bibliotheekinstellingen"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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 ""
+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 ""
+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:268
-msgid "LDAP Certificate Path"
-msgstr "LDAP certificaatlocatie"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP Authenticatie"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Niet geverifieerd"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Eenvoudig"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP Administrator naam"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP Administrator wachtwoord"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP Server is OpenLDAP?"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP groepnaam"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP groepleden veld"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr "Automatisch detecteren"
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externe programma's"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Locatie van Unrar-programma"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1830,10 +2001,6 @@ msgstr "Inloggen"
 msgid "View Configuration"
 msgstr "Instellingen bekijken"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Aantal te tonen willekeurige boeken"
@@ -1842,7 +2009,7 @@ msgstr "Aantal te tonen willekeurige boeken"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Aantal te tonen auteurs alvorens te verbergen (0=nooit verbergen)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Thema"
 
@@ -1976,7 +2143,7 @@ msgstr "Toevoegen aan boekenplank"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Openbaar)"
 
@@ -2024,11 +2191,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Volgende"
 
@@ -2036,6 +2199,10 @@ msgstr "Volgende"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Open het .kobo/Kobo eReader.conf bestand in een teksteditor en voeg toe (of bewerk):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Alles"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "Probleem melden"
@@ -2044,9 +2211,23 @@ msgstr "Probleem melden"
 msgid "Return to Home"
 msgstr "Terug naar startpagina"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Sorteren op reeks"
+#: 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: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:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2116,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Annuleren"
 
@@ -2129,12 +2309,8 @@ msgstr "Navigatie aanpassen"
 msgid "Search Library"
 msgstr "Zoek in bibliotheek"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Geavanceerd zoeken"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -2150,7 +2326,7 @@ msgstr "Afmelden"
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
@@ -2162,27 +2338,23 @@ msgstr "Deze pagina niet vernieuwen"
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Jouw boekenplanken"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informatie"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Boekgegevens"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Fout"
 
@@ -2214,30 +2386,82 @@ msgstr "Stream uitvoer, kan niet worden weergegeven"
 msgid "Show Access Log: "
 msgstr "Toon toegangslog: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Download Calibre-Web log"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Download toegangslog"
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Selecteer toegestane/geweigerde tags"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Selecteer toegestane/geweigerde aangepaste kolom waarden"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Selecteer toegestane/geweigerde tags van gebruikers"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Selecteer toegestane/geweigerde aangepaste kolom waarden van gebruikers"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Voer Tag in"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Voeg inkijk restrictie toe"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Het boekformaat wordt permanent gewist uit de database"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Het boek wordt verwijderd uit de Calibre-database"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "en van de harde schijf"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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"
@@ -2246,99 +2470,99 @@ msgstr "Calibre-Web - e-boekcatalogus"
 msgid "Reflow text when sidebars are open."
 msgstr "Tekstindeling automatisch aanpassen als het zijpaneel geopend is."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Vorige pagina"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Volgende pagina"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Optimaal inpassen"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Aanpassen aan breedte"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Aanpassen aan hoogte"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Ware grootte"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Rechtsom draaien"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Linksom draaien"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Afbeelding omdraaien"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Licht"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Donker"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Schaal"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Breedte"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Hoogte"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Ware grootte"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Draaien"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Omdraaien"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Richting"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Links-naar-rechts"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Rechts-naar-links"
 
@@ -2390,39 +2614,43 @@ msgstr "Zoekterm:"
 msgid "Results for:"
 msgstr "Resultaten voor:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Publicatiedatum van"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Publicatiedatum tot"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Labels uitsluiten"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Boekenreeksen uitsluiten"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Talen uitsluiten"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Extenties"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Extenties uitsluiten"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Met beoordeling hoger dan"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Met beoordeling lager dan"
 
@@ -2431,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:67
-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:70
+#: 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"
 
@@ -2454,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"
@@ -2475,8 +2711,8 @@ msgid "Series in this Library"
 msgstr "Boekenreeksen in deze bibliotheek"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Gekoppelde bibliotheken"
+msgid "System Statistics"
+msgstr "Systeem informatie"
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2554,19 +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:146
-msgid "Recent Downloads"
-msgstr "Recente downloads"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Genereer Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
-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 c6b05b1a..1f90fb07 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 0509948e..ab825d30 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+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"
@@ -17,385 +17,430 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "zainstalowane"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "nie zainstalowane"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Ponowne połączenie zakończono sukcesem"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Panel administratora"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Czy na pewno chcesz usunąć Token Kobo?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 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:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 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:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 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:581
+#: cps/admin.py:757
 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:594
+#: cps/admin.py:772
 #, 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:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, 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:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "Lokalizacja certyfikatu LDAP jest nieprawidłowa, wprowadź poprawną ścieżkę"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "Baza danych ustawień nie jest zapisywalna"
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Baza danych nie jest zapisywalna"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Konfiguracja podstawowa"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 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:814
+#: cps/admin.py:1028
 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:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, 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:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
 # ???
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 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:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Błąd: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
+
+#: cps/admin.py:1389
+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:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "nie skonfigurowane"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/editbooks.py:242
+#: 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:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s nie jest prawidłowym językiem"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do wysłania musi mieć rozszerzenie"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, 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:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Format pliku %(ext)s dodany do %(book)s"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Nie udało się przenieść pliku %(file)s:%(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, 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:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
@@ -404,186 +449,165 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Nie znaleziono formatu %(format)s dla id książki: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Wyślij do Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ten e-mail został wysłany za pośrednictwem Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nie znaleziono: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Wyślij do Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+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:111
 msgid "Calibre-Web test e-mail"
 msgstr "Testowy e-mail Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Testowy e-mail"
 
 # ???
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Zacznij korzystać z Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rejestracja e-mail dla użytkownika: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Wyślij %(format)s do Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konwertuj %(orig)s do %(format)s i wyślij do Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
 # ???
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Żądany plik nie mógł zostać odczytany. Sprawdź uprawnienia?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Usuwanie książki %(id)s zakończyło się błędem: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Usuwanie książki %(id)s, ścieżka książki jest niepoprawna: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Zmiana nazwy tytułu z: „%(src)s” na „%(dest)s” zakończyła się błędem: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Zmiana autora z: '%(src)s' na '%(dest)s' zakończyło się błędem: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Zmiana nazwy pliku w ścieżce '%(src)s' na '%(dest)s' zakończyło się błędem: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Nie znaleziono ścieżki do książki %(path)s na Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Błąd przy pobieraniu okładki"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Błędny format okładki"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Nie udało się utworzyć ścieżki dla okładki"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Plik okładki nie jest poprawnym plikiem obrazu lub nie mógł zostać zapisany"
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Nieudane"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Rozpoczynanie"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Zakończone"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konwertowanie: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Wyślij: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Nieznane zadanie: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Aby uzyskać prawidłowy api_endpoint dla urządzenia Kobo, należy skorzystać z dostępu do calibre-web spoza localhost"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Konfiguracja Kobo"
 
@@ -593,540 +617,555 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 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:151
 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:162
 msgid "Failed to log in with Google."
 msgstr "Nie udało się zalogować do Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 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:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, 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:229
 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:271
 #, 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:275
 #, 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:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 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:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "logowanie"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Nie znaleziono tokenu"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Token wygasł"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Powodzenie! Wróć do swojego urządzenia"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Książki"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+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:735
+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
-#, 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:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Utwórz półkę"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, 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:231
+msgid "Edit a shelf"
+msgstr "Edytuj półkę"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Wystąpił błąd"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Utwórz półkę"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Edytuj półkę"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Półka: „%(name)s”"
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Publiczna półka o nazwie '%(title)s' już istnieje."
 
-#: 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:291
+#, 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:409
-msgid "Hidden Book"
-msgstr "Ukryta książka"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Ostatnio dodane"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Półka: „%(name)s”"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Pokaż menu ostatnio dodanych książek"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Najpopularniejsze"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Pokaż menu najpopularniejszych książek"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Najwyżej ocenione"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Pokaż menu najwyżej ocenionych książek"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Przeczytane"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Pokaż menu przeczytane i nieprzeczytane"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Nieprzeczytane"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Pokaż nieprzeczytane"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Odkrywaj"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Pokaż menu losowych książek"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Kategorie"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Pokaż menu wyboru kategorii"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Cykle"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Pokaż menu wyboru cyklu"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Autorzy"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Pokaż menu wyboru autora"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Wydawcy"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Pokaż menu wyboru wydawcy"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Języki"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Pokaż menu wyboru języka"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Oceny"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Pokaż menu listy ocen"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Formaty plików"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Pokaż menu formatu plików"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "Zarchiwizowane książki"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "Pokaż zarchiwizowane książki"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Nieoczekiwane dane podczas odczytywania informacji o aktualizacji"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Brak dostępnej aktualizacji. Masz już zainstalowaną najnowszą wersję"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktualizować do najnowszej wersji."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Nie można pobrać informacji o aktualizacji"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Brak dostępnych informacji o wersji"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktualizować do wersji: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Kliknij przycisk poniżej, aby zaktualizować do najnowszej stabilnej wersji."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
-
-#: cps/web.py:374
-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:376
-msgid "User Successfully Imported"
-msgstr "Użytkownik pomyślnie zaimportowany"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Ostatnio dodane książki"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Książki"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Lista z ocenami"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Lista formatów"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Zadania"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Szukaj"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Opublikowane po "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Opublikowane przed "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Ocena <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Ocena >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "szukaj"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Wyszukiwanie"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Szukaj"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Lista z ocenami"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Lista formatów"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Zadania"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Opublikowane po "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Opublikowane przed "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Ocena <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Ocena >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 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:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, 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:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 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:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "logowanie"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Nie znaleziono tokenu"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Token wygasł"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Powodzenie! Wróć do swojego urządzenia"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Nie znaleziono narzędzia calibre %(tool)s do konwertowania"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Konwertowanie nie powiodło się: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter spowodowało błąd: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, 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:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Konwertowanie nie powiodło się: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Lista użytkowników"
@@ -1167,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:62
 msgid "Download"
 msgstr "Pobieranie"
 
@@ -1181,8 +1219,8 @@ msgstr "Edycja"
 
 # ???
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1194,11 +1232,11 @@ msgstr "Półka publiczna"
 msgid "Add New User"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "Importuj użytkowników LDAP"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "Ustawienia serwera e-mail SMTP"
 
@@ -1206,145 +1244,150 @@ msgstr "Ustawienia serwera e-mail SMTP"
 msgid "SMTP Hostname"
 msgstr "Adres serwera SMTP"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "Port serwera SMTP"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "Nazwa użytkownika SMTP"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Wyślij z adresu e-mail"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Poziom dziennika"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Liczba książek na stronie"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Wysyłanie"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Anonimowe przeglądanie"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Publiczna rejestracja"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Zdalne logowanie (Magic Link)"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Logowanie reverse proxy"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Nazwa nagłówka reverse proxy"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Edytuj podstawową konfigurację"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Edytuj konfigurację interfejsu"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Podgląd dziennika"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Połącz ponownie z bazą danych Calibre"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Uruchom ponownie Calibre Web"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Zatrzymaj Calibre Web"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Update (aktualizacja)"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Wersja"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Szczegóły"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Bieżąca wersja"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -1356,21 +1399,44 @@ msgstr "przez"
 msgid "In Library"
 msgstr "W Bibliotece"
 
-# ???
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Wszystko"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Więcej według"
 
@@ -1403,17 +1469,17 @@ msgstr "Konwertuj na:"
 msgid "Convert book"
 msgstr "Konwertuj książkę"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Tytuł książki"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1421,15 +1487,15 @@ msgstr "Opis"
 msgid "Identifiers"
 msgstr "Identyfikatory"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1437,7 +1503,7 @@ msgstr "Usuń"
 msgid "Add Identifier"
 msgstr "Dodaj identyfikator"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Etykiety"
 
@@ -1449,392 +1515,495 @@ msgstr "ID cyklu"
 msgid "Rating"
 msgstr "Ocena"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Pobierz okładkę z linku (JPEG - obraz zostanie pobrany i zapisany w bazie)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Wyślij okładkę z dysku lokalnego"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Data publikacji"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Język"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nie"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Wyślij format"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Po zapisaniu wyświetl szczegóły książki"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Czy jesteś pewny?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Książka zostanie usunięta z bazy danych Calibre"
-
-# ???
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "i z dysku twardego"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Ważne dla Kobo: usunięte książki pozostaną na każdym połączonym urządzeniu Kobo."
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Książki muszą najpierw zostać zarchiwizowane a urządzenie zsynchronizowane, zanim książka będzie mogła zostać bezpiecznie usunięta."
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Źródło"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
-#: cps/templates/book_edit.html:297
+#: 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."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Tytuł"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Czy jesteś pewny?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Konfiguracja biblioteki"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
-msgstr "Ścieżka certyfikatu LDAP"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Uwierzytelnianie LDAP"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Nieuwierzytelniony"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Proste"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nazwa administratora LDAP"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Hasło administratora LDAP"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Serwer LDAP to OpenLDAP?"
 
-#: cps/templates/config_edit.html:304
+#: 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:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtr obiektów grupy LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Nazwa grupy LDAP"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Pola członków grupy LDAP"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Zewnętrzne pliki"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Ścieżka do konwertera Calibre"
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Ustawienia konwertera calibre"
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Ścieżka do konwertera Kepubify"
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Lokalizacja pliku binarnego Unrar"
 
-#: cps/templates/config_edit.html:394 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ę"
@@ -1843,10 +2012,6 @@ msgstr "Zaloguj się"
 msgid "View Configuration"
 msgstr "Konfiguracja widoku"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Tytuł"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Liczba losowych książek do pokazania"
@@ -1855,7 +2020,7 @@ msgstr "Liczba losowych książek do pokazania"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Liczba autorów do pokazania przed ukryciem (0=wyłącza ukrywanie)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Motyw"
 
@@ -1989,7 +2154,7 @@ msgstr "Dodaj do półki"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(publiczna)"
 
@@ -2037,11 +2202,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Następne"
 
@@ -2049,6 +2210,11 @@ msgstr "Następne"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Otwórz plik .kobo/Kobo eReader.conf w edytorze tekstu i dodaj (lub edytuj):"
 
+# ???
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Wszystko"
+
 # | msgid "Create a Shelf"
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
@@ -2059,9 +2225,23 @@ msgstr "Zgłoś błąd"
 msgid "Return to Home"
 msgstr "Powrót do głównego menu"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Grupuj według cyklu"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2131,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:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Wróć"
 
@@ -2144,12 +2323,8 @@ msgstr "Przełącz nawigację"
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Wyszukiwanie"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -2165,7 +2340,7 @@ msgstr "Wyloguj się"
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Wysyłanie…"
 
@@ -2177,29 +2352,25 @@ msgstr "Proszę nie odświeżać strony"
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Twoje półki"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informacje"
 
 # ???
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
 # ???
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Błąd"
 
@@ -2231,30 +2402,83 @@ msgstr "Nie można wyświetlić wyjścia"
 msgid "Show Access Log: "
 msgstr "Pokaż dziennik dostępu: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Wybierz dozwolone/zabronione etykiety"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Wybierz dozwolone/zabronione etykiety użytkownika"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn użytkownika"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Wpisz etykietę"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Dodaj ograniczenie przeglądania"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Książka zostanie usunięta z bazy danych Calibre"
+
+# ???
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "i z dysku twardego"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Ważne dla Kobo: usunięte książki pozostaną na każdym połączonym urządzeniu Kobo."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Książki muszą najpierw zostać zarchiwizowane a urządzenie zsynchronizowane, zanim książka będzie mogła zostać bezpiecznie usunięta."
+
+#: cps/templates/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"
@@ -2263,99 +2487,99 @@ msgstr "Katalog e-booków Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Przepływ tekstu, gdy paski boczne są otwarte."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiaturowe"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Poprzednia strona"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Następna strona"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Skaluj do najlepszego"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Skaluj do szerokości"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Skaluj do wysokości"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Skaluj do wielkości oryginalnej"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Odwórć obraz"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Jasny"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Ciemny"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Skaluj"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Najlepszy"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Szerokość"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Wysokość"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Natywnie"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Obrót"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Odwróć"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Kierunek"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Od lewej do prawej"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Od prawej do lewej"
 
@@ -2407,39 +2631,43 @@ msgstr "Wyszukiwano:"
 msgid "Results for:"
 msgstr "Wyniki dla:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Data publikacji od"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Data publikacji do"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Wyklucz etykiety"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Wyklucz cykle"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Wyklucz języki"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Wyklucz rozszerzenia"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Ocena większa niż"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Ocena mniejsza niż"
 
@@ -2448,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:67
-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:70
+#: 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"
 
@@ -2471,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"
@@ -2492,8 +2728,8 @@ msgid "Series in this Library"
 msgstr "Cykle w tej bibliotece"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Załączone biblioteki"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2573,20 +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:146
-msgid "Recent Downloads"
-msgstr "Ostatnio pobrane"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Generuj Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
-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 61912dc3..913bc5d3 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 389428f2..8c4140ae 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,382 +17,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "установлено"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "не установлено"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, обновите страницу"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Успешно переподключено"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Вы действительно хотите удалить Kobo Token ?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Вы действительно хотите удалить эту книжную полку?"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "Неверное расположение сертификата LDAP, пожалуйста, введите правильный путь"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Тестовое письмо успешно отправлено на %(kindlemail)s"
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Ошибка: %(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Не удалось создать хотя бы одного пользователя LDAP"
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "не настроено"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Ошибка при открытии eBook. Файл не существует или файл недоступен"
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/editbooks.py:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Файл %(filename)s не удалось сохранить во временную папку"
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
@@ -401,184 +446,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s форма не найден для книги с id: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Отправить на Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Это электронное письмо было отправлено через Caliber-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s не найден: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Отправить на Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Это электронное письмо было отправлено через Caliber-Web."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Тестовый e-mail для Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Тестовый e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Начать работу с Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Регистрационный e-mail для пользователя: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Отправить %(format)s в Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Преобразовать %(orig)s в %(format)s и отправить в Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Эл. почта: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Запрашиваемый файл не может быть прочитан. Возможно у вас нет разрешения?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Переименовывание заголовка с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Переименовывание автора с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Не удалось переименовать файл по пути '%(src)s' to '%(dest)s' из-за ошибки: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Файл %(file)s не найден на Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Не удалось создать путь для обложки."
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
-msgstr "Только файлы jpg / jpeg / png / webp поддерживаются в качестве файла обложки"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Только файлы в формате jpg / jpeg поддерживаются как файл обложки"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Начало"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Завершено"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Конвертировать: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Загрузить: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Неизвестная задача: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Пожалуйста, подключитесь к Calibre-Web не с локального хоста, чтобы получить действительный api_endpoint для устройства Kobo"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Настройка Kobo"
 
@@ -587,540 +611,555 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Не удалось войти в систему с помощью GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Не удалось получить информацию о пользователе из GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Не удалось войти в систему с помощью Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Не удалось получить информацию о пользователе из Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Связь с %(oauth)s Успешна"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Не удалось войти, ни один пользователь не связан с учетной записью OAuth"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Отмена связи с %(oauth)s успешно"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Связь с %(oauth)s не удалось отмененить"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "Ошибка GitHub Oauth, пожалуйста попробуйте позже."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Ошибка Google Oauth, пожалуйста попробуйте позже."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "войти"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Ключ не найден"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Ключ просрочен"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Успешно! Пожалуйста, проверьте свое устройство"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Публичная полка с названием '%(title)s' уже существует."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Создать полку"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Приватная полка с названием '%(title)s' уже существует."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Изменить полку"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана полка %(title)s"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Произошла ошибка"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Создать полку"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Колка %(title)s изменена"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Изменить полку"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Произошла ошибка"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Полка: '%(name)s'"
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Публичная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Приватная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Скрытая книга"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Недавно Добавленные"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Полка: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Показывать недавние книги"
+#: cps/shelf.py:427
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Популярные Книги"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Показывать популярные книги"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Книги с наилучшим рейтингом"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Показывать книги с наивысшим рейтингом"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Прочитанные Книги"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Показывать прочитанные и непрочитанные"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Непрочитанные Книги"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Показать непрочитанное"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Обзор"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Показывать случайные книги"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Категории"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Показывать выбор категории"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Серии"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Показывать выбор серии"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Авторы"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Показывать выбор автора"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Издатели"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Показать выбор издателя"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Языки"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Показывать выбор языка"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Рейтинги"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Показать выбор рейтинга"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Форматы файлов"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Показать выбор форматов файлов"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Некорректные данные при чтении информации об обновлении"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Нет доступных обновлений. Вы используете последнюю версию"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Новое обновление доступно. Нажмите на кнопку ниже, чтобы обновить до последней версии."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Не удалось получить информацию об обновлении"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Информация о выпуске недоступна"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Новое обновление доступно. Нажмите на кнопку ниже, чтобы обновиться до версии: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Нажмите на кнопку ниже для обновления до последней стабильной версии."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Не удалось создать хотя бы одного пользователя LDAP"
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr "Пользователь успешно импортирован"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Недавно Добавленные Книги"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Книги"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/web.py:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Список рейтингов"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Список форматов файлов"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Задания"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Поиск"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Опубликовано после "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Опубликовано до "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Рейтинг <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Рейтинг >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "поиск"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Расширенный поиск"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Поиск"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Список рейтингов"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Список форматов файлов"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Задания"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Опубликовано после "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Опубликовано до "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Рейтинг <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Рейтинг >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1308
+#: cps/web.py:1250
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "регистрация"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr "Этот никнейм или e-mail уже используются."
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "войти"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Ключ не найден"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Ключ просрочен"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Успешно! Пожалуйста, проверьте свое устройство"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Читать Книгу"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Ошибка Ebook-конвертора: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ошибка Ebook-конвертора: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Список пользователей"
@@ -1159,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:62
 msgid "Download"
 msgstr "Скачать"
 
@@ -1172,8 +1210,8 @@ msgid "Edit"
 msgstr "Редактировать"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1185,11 +1223,11 @@ msgstr ""
 msgid "Add New User"
 msgstr "Добавить нового пользователя"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "Импорт пользователей LDAP"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "Настройки SMTP-сервера"
 
@@ -1197,145 +1235,150 @@ msgstr "Настройки SMTP-сервера"
 msgid "SMTP Hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP-логин"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Отправитель"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Настройки сервера"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Расположение базы данных Calibre"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Уровень логирования"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Количество книг на странице"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Загрузка на сервер"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Анонимный просмотр"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Публичная регистрация"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Удалённый логин"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Логин обратного прокси"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Имя заголовка обратного прокси"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Изменить основные настройки"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Изменить настройки интерфейса"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Управление"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Просмотреть лог файл"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Пере подключиться к базе жанных Calibre"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Перезагрузить Calibre-Web"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Остановить Calibre-Web"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Обновление"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Версия"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Подробности"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Текущая версия"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 "Отмена"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу"
 
@@ -1347,20 +1390,44 @@ msgstr "с помощью"
 msgid "In Library"
 msgstr "В библиотеке"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Все"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Ещё от"
 
@@ -1392,17 +1459,17 @@ msgstr "Конвертировать в:"
 msgid "Convert book"
 msgstr "Конвертировать книгу"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Название книги"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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 "Описание"
 
@@ -1410,15 +1477,15 @@ msgstr "Описание"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1426,7 +1493,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Теги"
 
@@ -1438,390 +1505,494 @@ msgstr "ID Серии"
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL обложки(jpg, обложка загружается и сохраняется в базе данных, после этого поле снова пустое)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Загрузить обложку с диска"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Опубликовано"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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 "Издатель"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Язык"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Нет"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Загружаемый формат"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Просмотреть книгу после сохранения"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Вы действительно уверены?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Книга будет удалена из базы данных Calibre"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "и с диска"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Поиск по ключевому слову "
 
-#: cps/templates/book_edit.html:240
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
 
-#: cps/templates/book_edit.html:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Источник"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Ошибка поиска!"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Результат(ы) не найдены! Попробуйте другое ключевое слово."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Заголовок"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Вы действительно уверены?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Настройки библотеки"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
-msgstr "Путь сертификата LDAP"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Аутентификация LDAP"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Анонимный"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Неаутентифицированный"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Простой"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Имя администратора LDAP"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Пароль администратора LDAP"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Отличительное имя LDAP (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Фильтр объектов пользователя LDAP"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Сервер LDAP - это OpenLDAP ?"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "Следующие настройки необходимы для импорта пользователем."
 
-#: cps/templates/config_edit.html:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Фильтр объектов группы LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Имя группы LDAP"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Поле членов группы LDAP"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Получить %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:326
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth ID клиента"
 
-#: cps/templates/config_edit.html:330
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Секрет клиента"
 
-#: cps/templates/config_edit.html:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Конвертация"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Расположение бинарного файла Unrar"
 
-#: cps/templates/config_edit.html:394 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 "Логин"
@@ -1830,10 +2001,6 @@ msgstr "Логин"
 msgid "View Configuration"
 msgstr "Просмотреть Конфигурацию"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Заголовок"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Количество отображаемых случайных книг"
@@ -1842,7 +2009,7 @@ msgstr "Количество отображаемых случайных кни
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Количество авторов для отображения перед скрытием (0 = отключить скрытие)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Тема"
 
@@ -1976,7 +2143,7 @@ msgstr "Добавить на книжную полку"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Публичная)"
 
@@ -2024,11 +2191,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далее"
 
@@ -2036,6 +2199,10 @@ msgstr "Далее"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Откройте файл .kobo / Kobo eReader.conf в текстовом редакторе и добавьте (или отредактируйте):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Все"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "Создать запись"
@@ -2044,9 +2211,23 @@ msgstr "Создать запись"
 msgid "Return to Home"
 msgstr "Вернуться на главную"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Сгрупировать по серии"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2116,8 +2297,7 @@ msgstr "Книги организованы на полках"
 msgid "Home"
 msgstr "Главная"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Назад"
 
@@ -2129,12 +2309,8 @@ msgstr "Включить навигацию"
 msgid "Search Library"
 msgstr "Поиск в библиотеке"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Расширенный поиск"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Настройки"
 
@@ -2150,7 +2326,7 @@ msgstr "Выход"
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Загружается..."
 
@@ -2162,27 +2338,23 @@ msgstr "Пожалуйста не обновляйте страницу"
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Ваши полки"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Ошибка"
 
@@ -2214,30 +2386,82 @@ msgstr "Выходной поток, не может быть отображен
 msgid "Show Access Log: "
 msgstr "Показать журнал доступа: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Выбрать разрешенные / запрещенные теги"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Выбрать разрешенные / запрещенные значения индивидуальных столбцов"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Выбрать разрешенные / запрещенные теги пользователя"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Выбрать разрешенные / запрещенные значения индивидуальных столбцов пользователя"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Введите тег"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Добавить ограничение просмотра"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Книга будет удалена из базы данных Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "и с диска"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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"
@@ -2246,99 +2470,99 @@ msgstr "Каталог электронных книг Caliber-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Обновить размещение текста при открытии боковой панели."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Предыдущая страница"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Следующая страница"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Масштабировать до лучшего"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Масштабироваать по ширине"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Масштабировать по высоте"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Масштабировать до оригинала"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Повернуть Вправо"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Повернуть Влево"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Перевернуть изображение"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Светлая"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Темная"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Масштаб"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Лучшее"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Ширина"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Длина"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Оригинальный"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Повернуть"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Перевернуть"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Горизонтально"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Вертикально"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Направление"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Слева направо"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Справа налево"
 
@@ -2390,39 +2614,43 @@ msgstr "Выражение для поиска:"
 msgid "Results for:"
 msgstr "Результаты для:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Опубликовано от"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Опубликовано до"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Исключить теги"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Исключить серии"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Исключить языки"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Расширения"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Исключить расширения"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Рейтинг больше чем"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Рейтинг меньше чем"
 
@@ -2431,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:67
-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:70
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Книжная полка будет безвозвратно удалена для всех"
 
@@ -2454,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"
@@ -2475,8 +2711,8 @@ msgid "Series in this Library"
 msgstr "Серий в этой Библиотеке"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Связанные библиотеки"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2554,19 +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:146
-msgid "Recent Downloads"
-msgstr "Последние загрузки"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Создать Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
-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 6bc8e50f..0115bb12 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 941e14de..75dd3f3c 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+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"
@@ -16,382 +16,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "installerad"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "inte installerad"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Statistik"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server startas om, vänligen uppdatera sidan"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Okänd"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Administrationssida"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Vill du verkligen ta bort Kobo-token?"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 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:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 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:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Ett okänt fel uppstod."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-post skicka till %(kindlemail)s"
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "inte konfigurerad"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, 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:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, 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:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
@@ -400,184 +445,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formatet hittades inte för bok-id: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Skicka till Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s hittades inte: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Skicka till Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web test e-post"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Test e-post"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Kom igång med Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrera e-post för användare: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Skicka %(format)s till Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konvertera %(orig)s till %(format)s och skicka till Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-post: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Den begärda filen kunde inte läsas. Kanske fel behörigheter?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Byt namn på titel från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Byt namn på författare från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Byt namn på fil i sökvägen '%(src)s' till '%(dest)s' misslyckades med fel: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Filen %(file)s hittades inte på Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "Det gick inte att skapa sökväg för omslag"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-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:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Endast jpg/jpeg-filer stöds som omslagsfil"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Väntar"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Startad"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Klar"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-post: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konvertera: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Överför: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Okänd uppgift: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Vänligen få tillgång till calibre-web från icke localhost för att få giltig api_endpoint för Kobo-enhet"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Kobo-installation"
 
@@ -586,540 +610,555 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 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:151
 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:162
 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:167
 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:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 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:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "logga in"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Token hittades inte"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Token har löpt ut"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Lyckades! Vänligen återvänd till din enhet"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "Böcker"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "skapa en hylla"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Redigera en hylla"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hyllan %(title)s skapad"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Det fanns ett fel"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "skapa en hylla"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hyllan %(title)s ändrad"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Redigera en hylla"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Hylla: '%(name)s'"
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
 
-#: 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:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
 
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Dold bok"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Nyligen tillagda"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Hylla: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Visa senaste böcker"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Heta böcker"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Visa heta böcker"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Bäst rankade böcker"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Visa böcker med bästa betyg"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Lästa böcker"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Visa lästa och olästa"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Olästa böcker"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Visa olästa"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Upptäck"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Visa slumpmässiga böcker"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Kategorier"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Visa kategorival"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Serier"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Visa serieval"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Författare"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Visa författarval"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Förlag"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Visa urval av förlag"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Språk"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Visa språkval"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Betyg"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Visa val av betyg"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Filformat"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Visa val av filformat"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Oväntade data vid läsning av uppdateringsinformation"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Ingen uppdatering tillgänglig. Du har redan den senaste versionen installerad"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att uppdatera till den senaste versionen."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Kunde inte hämta uppdateringsinformation"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att uppdatera till version: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicka på knappen nedan för att uppdatera till den senaste stabila versionen."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Nyligen tillagda böcker"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "Böcker"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 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:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Betygslista"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Lista över filformat"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Sök"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Publicerad efter "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Publicerad före "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Betyg <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Betyg >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "sök"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Avancerad sökning"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Sök"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Betygslista"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Lista över filformat"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Publicerad efter "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Publicerad före "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Betyg <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Betyg >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, 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:1310
+#: cps/web.py:1252
 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:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "registrera"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "logga in"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Token hittades inte"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Token har löpt ut"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Lyckades! Vänligen återvänd till din enhet"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Läs en bok"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "E-bokkonverteraren misslyckades: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "E-bokkonverteraren misslyckades: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Användarlista"
@@ -1158,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:62
 msgid "Download"
 msgstr "Hämta"
 
@@ -1171,8 +1209,8 @@ msgid "Edit"
 msgstr "Redigera"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1184,11 +1222,11 @@ msgstr ""
 msgid "Add New User"
 msgstr "Lägg till ny användare"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "Inställningar för SMTP-e-postserver"
 
@@ -1196,145 +1234,150 @@ msgstr "Inställningar för SMTP-e-postserver"
 msgid "SMTP Hostname"
 msgstr "SMTP-värdnamn"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP-port"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP-inloggning"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Från meddelande"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Calibre DB dir"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Böcker per sida"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Laddar upp"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Anonym surfning"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Publik registrering"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "Fjärrinloggning"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "Omvänd proxy inloggning"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Omvänt proxy rubriknamn"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "Redigera grundläggande konfiguration"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Redigera UI-konfiguration"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "Visa loggfiler"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Anslut till Calibre DB igen"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "Starta om Calibre-Web"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "Stoppa Calibre-Web"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Uppdatera"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Detaljer"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Aktuell version"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Sök efter uppdatering"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Utför uppdatering"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "Är du säker på att du vill starta om Calibre-Web?"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Uppdaterar, vänligen uppdatera inte sidan"
 
@@ -1346,20 +1389,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Alla"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Mer av"
 
@@ -1391,17 +1458,17 @@ msgstr "Konvertera till:"
 msgid "Convert book"
 msgstr "Konvertera boken"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Boktitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1409,15 +1476,15 @@ msgstr "Beskrivning"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1425,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Taggar"
 
@@ -1437,390 +1504,494 @@ msgstr "Serie-ID"
 msgid "Rating"
 msgstr "Betyg"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Omslagswebbadress (jpg, omslag hämtas och lagras i databasen, fältet är efteråt tomt igen)"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "Ladda upp omslag från lokal enhet"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Publiceringsdatum"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Språk"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nej"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Ladda upp format"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "Visa bok vid Spara"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Är du verkligen säker?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Boken kommer att tas bort från Calibre-databasen"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "och från hårddisken"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Sökord"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Sök sökord "
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Källa"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Sökningsfel!"
 
-#: cps/templates/book_edit.html:297
+#: 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."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Är du verkligen säker?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Bibliotekets konfiguration"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP-adminstratörsanvändarnamn"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP-adminstratörslösenord"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP-användarobjektfilter"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP-server är OpenLDAP?"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externa binärer"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Plats för Unrar-binär"
 
-#: cps/templates/config_edit.html:394 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"
@@ -1829,10 +2000,6 @@ msgstr "Logga in"
 msgid "View Configuration"
 msgstr "Visa konfiguration"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Antal slumpmässiga böcker att visa"
@@ -1841,7 +2008,7 @@ msgstr "Antal slumpmässiga böcker att visa"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Antal författare att visa innan de döljs (0 = inaktivera dölja)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Tema"
 
@@ -1975,7 +2142,7 @@ msgstr "Lägg till hyllan"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2023,11 +2190,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Nästa"
 
@@ -2035,6 +2198,10 @@ msgstr "Nästa"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "Öppna filen .kobo/Kobo eReader.conf i en textredigerare och lägg till (eller redigera):"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Alla"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "Skapa ärende"
@@ -2043,9 +2210,23 @@ msgstr "Skapa ärende"
 msgid "Return to Home"
 msgstr "Tillbaka till hemmet"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Gruppera efter serie"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2115,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "Hem"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Tillbaka"
 
@@ -2128,12 +2308,8 @@ msgstr "Växla navigering"
 msgid "Search Library"
 msgstr "Sök i bibliotek"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Avancerad sökning"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -2149,7 +2325,7 @@ msgstr "Logga ut"
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
@@ -2161,27 +2337,23 @@ msgstr "Vänligen uppdatera inte sidan"
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Dina hyllor"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Fel"
 
@@ -2213,30 +2385,82 @@ msgstr "Strömutmatning kan inte visas"
 msgid "Show Access Log: "
 msgstr "Visa åtkomstlogg: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Välj tillåtna/avvisade taggar"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Välj tillåtna/avvisade anpassade kolumnvärden"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Välj tillåtna/avvisade användarens taggar"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Välj tillåtna/avvisade anpassade kolumnvärden för användaren"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Ange tagg"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Lägg till visningsbegränsning"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Boken kommer att tas bort från Calibre-databasen"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "och från hårddisken"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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"
@@ -2245,99 +2469,99 @@ msgstr "Calibre-Web e-bokkatalog"
 msgid "Reflow text when sidebars are open."
 msgstr "Fyll i texten igen när sidofält är öppna."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Kortkommandon"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "Skala till bäst"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Skala till bredd"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Skala till höjd"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Skala till ursprunglig"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Vänd bilden"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Ljust"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Mörkt"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Skala"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "Bäst"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Bredd"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Höjd"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Ursprunglig"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Rotera"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Vänd"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Riktning"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Vänster till höger"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Höger till vänster"
 
@@ -2389,39 +2613,43 @@ msgstr "Sökterm:"
 msgid "Results for:"
 msgstr "Resultat för:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Publiceringsdatum från"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Publiceringsdatum till"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Uteslut taggar"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Uteslut serier"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Uteslut språk"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Tillägg"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Uteslut tillägg"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Betyg större än"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Betyg mindre än"
 
@@ -2430,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:67
-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:70
+#: 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"
 
@@ -2453,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"
@@ -2474,8 +2710,8 @@ msgid "Series in this Library"
 msgstr "Serier i detta bibliotek"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Kopplade bibliotek"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2553,19 +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:146
-msgid "Recent Downloads"
-msgstr "Senaste hämtningar"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "Skapa Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
-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 3880d84d..03c04d13 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 0ebb1e28..67f0c5b9 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,382 +16,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "yüklü"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "yüklü değil"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Sunucu yeniden başlatıldı, lütfen sayfayı yeniden yükleyin"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Sunucu kapatıyor, lütfen pencereyi kapatın"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Yönetim sayfası"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Arayüz Ayarları"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Temel Ayarlar"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 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:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "Bu e-posta adresi için bir hesap mevcut."
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Bilinmeyen bir hata oluştu."
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, 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:947
+#: cps/admin.py:1159
 #, 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:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 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:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 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:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "ayarlanmadı"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 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:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "metaveri düzenle"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s geçerli bir dil değil"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, 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:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, 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:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 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:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 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:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 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:891
+#: cps/editbooks.py:957
 #, 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:895
+#: cps/editbooks.py:961
 #, 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"
@@ -400,184 +445,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(book)d nolu kitap için %(format)s biçimi bulunamadı"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Kindle'a gönder"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s bulunamadı: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Kindle'a gönder"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web deneme e-Postası"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "Deneme e-Postası"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Web'i Kullanmaya Başlayın"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Kullanıcı Kayıt e-Postası: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s biçimlerini Kindle'a gönder"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s'dan %(format)s biçimine çevir ve Kindle'a gönder"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "e-Posta: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "İstenilen dosya okunamadı. Yanlış izinlerden kaynaklanabilir?"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kitap adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Yazar adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Dosya adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "Bekleniyor"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "Başarısız"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "Başladı"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "Bitti"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "Bilinmeyen Durum"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "e-Posta: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Dönüştür: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Yükle: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Bilinmeyen Görev: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr ""
 
@@ -586,540 +610,555 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "GitHub ile giriş yapılamadı."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 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:162
 msgid "Failed to log in with Google."
 msgstr "Google ile giriş yapılamadı."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Google'dan kullanıcı bilgileri alınamadı."
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, 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:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth hatası, lütfen tekrar deneyin."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 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:65 cps/web.py:1392
+msgid "login"
+msgstr "giriş"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Token bulunamadı"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Token süresi doldu"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Başarılı! Lütfen cihazınıza dönün"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+msgstr "eKitaplar"
+
+#: 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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Kitaplık oluştur"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Kitaplığı düzenle"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s kitaplığı oluşturuldu."
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Bir hata oluştu"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "Kitaplık oluştur"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s kitaplığı değiştirildi"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Kitaplığı düzenle"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, 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"
+msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:414
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Yeni"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Kitaplık: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Son eKitapları göster"
+#: cps/shelf.py:427
+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/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Popüler"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr ""
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr ""
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr ""
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Okunanlar"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Okunan ve okunmayanları göster"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Okunmamışlar"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "Okunmamışları göster"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Keşfet"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Rastgele eKitap göster"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Kategoriler"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Kategori seçimini göster"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Seriler"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Seri seçimini göster"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Yazarlar"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Yazar seçimini göster"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "Yayıncılar"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "Yayıncı seçimini göster"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Diller"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Dil seçimini göster"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "Değerlendirmeler"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "Değerlendirme seçimini göster"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "Biçimler"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "Dosya biçimi seçimini göster"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Güncelleme bilgileri okunurken beklenmeyen veri"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Yeni güncelleme mevcut değil. Zaten en son sürüme sahipsiniz."
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdaki düğmeye tıklayın."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Güncelleme bilgileri alınamadı"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Sürüm bilgisi mevcut değil"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdaki düğmeye tıklayın: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Son kararlı sürüme güncellemek için aşağıdaki düğmeye tıklayın."
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Yeni Eklenen eKitaplar"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "eKitaplar"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "Değerlendirme listesi"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "Biçim listesi"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "Görevler"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Ara"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "Yayınlanma (sonra)"
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Yayınlanma (önce)"
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Değerlendirme <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Değerlendirme >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "ara"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Gelişmiş Arama"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Ara"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "Değerlendirme listesi"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "Biçim listesi"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "Görevler"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "Yayınlanma (sonra)"
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Yayınlanma (önce)"
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Değerlendirme <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Değerlendirme >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, 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:1308
+#: cps/web.py:1250
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 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:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "kaydol"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 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:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 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:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "giriş"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Token bulunamadı"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Token süresi doldu"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Başarılı! Lütfen cihazınıza dönün"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Kitap Oku"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "eKitap-Dönüştürücü hatası: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "eKitap-Dönüştürücü hatası: %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1158,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:62
 msgid "Download"
 msgstr "İndirme"
 
@@ -1171,8 +1209,8 @@ msgid "Edit"
 msgstr "Düzenleme"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Sil"
 
@@ -1184,11 +1222,11 @@ msgstr ""
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr ""
 
@@ -1196,145 +1234,150 @@ msgstr ""
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Ayarlar"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Log Seviyesi"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "Ters Proxy header adı"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Yönetim"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "Güncelleme"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "Sürüm"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "Detaylar"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "Geçerli sürüm"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Güncelle"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1346,20 +1389,44 @@ msgstr "ile"
 msgid "In Library"
 msgstr "Kitaplıkta"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "Tümü"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "daha fazla"
 
@@ -1391,17 +1458,17 @@ msgstr "Dönüştür:"
 msgid "Convert book"
 msgstr "eKitabı dönüştür"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Kitap Adı"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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"
 
@@ -1409,15 +1476,15 @@ msgstr "Açıklama"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1425,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Etiketler"
 
@@ -1437,390 +1504,494 @@ msgstr ""
 msgid "Rating"
 msgstr "Değerlendirme"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Dil"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Hayır"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "Emin misiniz?"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr ""
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr ""
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Anahtar Kelime"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "Anahtar kelime ara"
 
-#: cps/templates/book_edit.html:240
+#: 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:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Kaynak"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Arama hatası!"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Başlık"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Emin misiniz?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Kitaplık Ayarları"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
-msgid "LDAP Authentication"
-msgstr ""
-
-#: cps/templates/config_edit.html:275
-msgid "Anonymous"
-msgstr ""
-
-#: cps/templates/config_edit.html:276
-msgid "Unauthenticated"
-msgstr ""
-
-#: cps/templates/config_edit.html:277
-msgid "Simple"
-msgstr ""
-
-#: cps/templates/config_edit.html:282
-msgid "LDAP Administrator Username"
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:288
-msgid "LDAP Administrator Password"
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
-msgid "LDAP Distinguished Name (DN)"
-msgstr "LDAP Ayırt Edici Adı (DN)"
-
 #: cps/templates/config_edit.html:297
-msgid "LDAP User Object Filter"
+msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
-msgid "LDAP Server is OpenLDAP?"
-msgstr "LDAP Sunucusu OpenLDAP kullanıyor?"
+#: cps/templates/config_edit.html:299
+msgid "Anonymous"
+msgstr ""
 
-#: cps/templates/config_edit.html:304
-msgid "Following Settings are Needed For User Import"
+#: cps/templates/config_edit.html:300
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:301
+msgid "Simple"
 msgstr ""
 
 #: cps/templates/config_edit.html:306
+msgid "LDAP Administrator Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:312
+msgid "LDAP Administrator Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:317
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP Ayırt Edici Adı (DN)"
+
+#: cps/templates/config_edit.html:321
+msgid "LDAP User Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:326
+msgid "LDAP Server is OpenLDAP?"
+msgstr "LDAP Sunucusu OpenLDAP kullanıyor?"
+
+#: cps/templates/config_edit.html:328
+msgid "Following Settings are Needed For User Import"
+msgstr ""
+
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: 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:326
+#: 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:330
+#: 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:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Harici Uygulamalar"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrar aracı konumu"
 
-#: cps/templates/config_edit.html:394 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ş"
@@ -1829,10 +2000,6 @@ msgstr "Giriş"
 msgid "View Configuration"
 msgstr "Yapılandırmayı Göster"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Başlık"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr ""
@@ -1841,7 +2008,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Tema"
 
@@ -1975,7 +2142,7 @@ msgstr "Kitaplığa ekle"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2023,11 +2190,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2035,6 +2198,10 @@ msgstr "Sonraki"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "Tümü"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr ""
@@ -2043,9 +2210,23 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "Serilere göre grupla"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2115,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "Anasayfa"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Geri"
 
@@ -2128,12 +2308,8 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Gelişmiş Arama"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ayarlar"
 
@@ -2149,7 +2325,7 @@ msgstr "Çıkış"
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
@@ -2161,27 +2337,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Gözat"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Kitaplıklarınız"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Hakkında"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Önceki"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "eKitap Detayları"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Hata"
 
@@ -2213,30 +2385,82 @@ msgstr "Akış çıktısı, görüntülenemiyor"
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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 ""
@@ -2245,99 +2469,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "Kenar çubukları açıkken metni kaydır"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "En İyiye Ölçeklendir"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "Genişliğe Ölçeklendir"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "Yüksekliğe Ölçeklendir"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "Asıla göre ölçeklendir"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "Sağa çevir"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "Sola çevir"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "Resmi döndir"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "Açık"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "Koyu"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "Ölçeklendir"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "En İyi"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "Genişlik"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "Yükseklik"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "Asıl"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "Çevir"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "Döndür"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "Yatay"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "Dikey"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "Yön"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "Soldan Sağa"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "Sağdan Sola"
 
@@ -2389,39 +2613,43 @@ msgstr ""
 msgid "Results for:"
 msgstr "Sonuçlar:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr ""
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Etiketleri Hariç Tut"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Serileri Hariç Tut"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Dilleri Hariç Tut"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Uzantılar"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Uzantıları Hariç Tut"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2430,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:67
-msgid "Are you sure you want to delete this shelf?"
+msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:70
+#: 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 ""
 
@@ -2453,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 ""
@@ -2474,7 +2710,7 @@ msgid "Series in this Library"
 msgstr "Bu kitaplıktaki Seriler"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
+msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
@@ -2553,19 +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:146
-msgid "Recent Downloads"
-msgstr "Son İndirilenler"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
-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 989ee268..d20b1adb 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 7a7da6f4..10304b19 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+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"
@@ -15,382 +15,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "не встановлено"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Сторінка адміністратора"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Ви справді хочете видалити книжкову полицю?"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Сталась невідома помилка"
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr ""
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Сталась помилка при відкриванні eBook. Файл не існує або відсутній доступ до нього"
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -399,184 +444,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:89
+#: cps/helper.py:86 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Відправити на Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Відправити на Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr ""
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr ""
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr ""
 
@@ -585,540 +609,555 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "увійти"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "Токен не знайдено"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Час дії токено вичерпано"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "створити книжкову полицю"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Змінити книжкову полицю"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Створена книжкова полиця %(title)s"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "Сталась помилка"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "створити книжкову полицю"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжкова полиця %(title)s змінена"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "Змінити книжкову полицю"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Сталась помилка"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, 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"
+msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:414
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "Останні додані"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Книжкова полиця: '%(name)s'"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "Показувати останні книги"
+#: cps/shelf.py:427
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "Популярні книги"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "Показувати популярні книги"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "Книги з найкращим рейтингом"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "Показувати книги з найвищим рейтингом"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "Прочитані книги"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "Показувати прочитані та непрочитані книги"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "Непрочитані книги"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr ""
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "Огляд"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "Показувати випадкові книги"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "Категорії"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "Показувати вибір категорії"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "Серії"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "Показувати вибір серії"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "Автори"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "Показувати вибір автора"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr ""
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr ""
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "Мови"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "Показувати вибір мови"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr ""
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr ""
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr ""
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr ""
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "Нещодавно додані книги"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr ""
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/web.py:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr ""
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "Пошук"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr ""
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "Опубліковано до"
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "пошук"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "Розширений пошук"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "Пошук"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr ""
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr ""
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "Опубліковано до"
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1308
+#: cps/web.py:1250
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "зареєструватись"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "увійти"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "Токен не знайдено"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Час дії токено вичерпано"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "Читати книгу"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
+msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr ""
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Список користувачів"
@@ -1157,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:62
 msgid "Download"
 msgstr "Завантажити"
 
@@ -1170,8 +1208,8 @@ msgid "Edit"
 msgstr "Редагувати"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Видалити"
 
@@ -1183,11 +1221,11 @@ msgstr ""
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr ""
 
@@ -1195,145 +1233,150 @@ msgstr ""
 msgid "SMTP Hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "SSL"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP логін"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "Відправник"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Налаштування сервера"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "Кількість книг на сторінці"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "Загрузка на сервер"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "Анонімний перегляд"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "Публічна реєстрація"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr ""
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "Адміністрування"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "Повторне підключення до БД Calibre"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "Перевірка оновлень"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "Встановити оновлення"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
@@ -1345,20 +1388,44 @@ msgstr "через"
 msgid "In Library"
 msgstr "У бібліотеці"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Більше за"
 
@@ -1390,17 +1457,17 @@ msgstr ""
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Назва книги"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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 "Опис"
 
@@ -1408,15 +1475,15 @@ msgstr "Опис"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1424,7 +1491,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Теги"
 
@@ -1436,390 +1503,494 @@ msgstr ""
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "Опубліковано"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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 "Видавець"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "Мова"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ні"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "Формат завантаження"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "переглянути книгу після редагування"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr ""
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "Книга буде видалена з БД Calibre"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "і з диску"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "Ключове слово"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Пошук по ключовому слову"
 
-#: cps/templates/book_edit.html:240
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Натисніть на обкладинку, щоб отримати метадані"
 
-#: cps/templates/book_edit.html:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Джерело"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Помилка пошуку!"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Заголовок"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr ""
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Налаштування бібліотеки"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
-msgid "LDAP Authentication"
-msgstr ""
-
-#: cps/templates/config_edit.html:275
-msgid "Anonymous"
-msgstr ""
-
-#: cps/templates/config_edit.html:276
-msgid "Unauthenticated"
-msgstr ""
-
-#: cps/templates/config_edit.html:277
-msgid "Simple"
-msgstr ""
-
-#: cps/templates/config_edit.html:282
-msgid "LDAP Administrator Username"
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:288
-msgid "LDAP Administrator Password"
-msgstr ""
-
-#: cps/templates/config_edit.html:293
-msgid "LDAP Distinguished Name (DN)"
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:297
-msgid "LDAP User Object Filter"
+msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
-msgid "LDAP Server is OpenLDAP?"
+#: cps/templates/config_edit.html:299
+msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:304
-msgid "Following Settings are Needed For User Import"
+#: cps/templates/config_edit.html:300
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:301
+msgid "Simple"
 msgstr ""
 
 #: cps/templates/config_edit.html:306
+msgid "LDAP Administrator Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:312
+msgid "LDAP Administrator Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:317
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:321
+msgid "LDAP User Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:326
+msgid "LDAP Server is OpenLDAP?"
+msgstr ""
+
+#: cps/templates/config_edit.html:328
+msgid "Following Settings are Needed For User Import"
+msgstr ""
+
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:326
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:330
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:394 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 "Ім'я користувача"
@@ -1828,10 +1999,6 @@ msgstr "Ім'я користувача"
 msgid "View Configuration"
 msgstr "Переглянути налаштування"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Заголовок"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Кількість показаних випадкових книг"
@@ -1840,7 +2007,7 @@ msgstr "Кількість показаних випадкових книг"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "Тема"
 
@@ -1974,7 +2141,7 @@ msgstr "Додати на книжкову полицю"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2022,11 +2189,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далі"
 
@@ -2034,6 +2197,10 @@ msgstr "Далі"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr ""
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr ""
@@ -2042,8 +2209,22 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
-msgid "Group by series"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
 msgstr ""
 
 #: cps/templates/index.xml:6
@@ -2114,8 +2295,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Назад"
 
@@ -2127,12 +2307,8 @@ msgstr "Включити навігацію"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Розширений пошук"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -2148,7 +2324,7 @@ msgstr "Вийти"
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Завантаження..."
 
@@ -2160,27 +2336,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Ваші книжкові полиці"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Деталі"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr ""
 
@@ -2212,30 +2384,82 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Книга буде видалена з БД Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "і з диску"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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 ""
@@ -2244,99 +2468,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "Переформатувати текст, коли відкриті бічні панелі."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr ""
 
@@ -2388,39 +2612,43 @@ msgstr ""
 msgid "Results for:"
 msgstr "Результати для:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Дата публікації з"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Дата публікації до"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Виключити теги"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Виключити серії"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Виключити мови"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2429,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:67
-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:70
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Книжкова полиця буде остаточно видалена для всіх"
 
@@ -2452,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"
@@ -2473,8 +2709,8 @@ msgid "Series in this Library"
 msgstr "Серій в цій бібліотеці"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "Встановлене ПЗ"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2552,19 +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:146
-msgid "Recent Downloads"
-msgstr "Нещодавно переглянуті"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
-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 8359e9b7..2a784326 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 10349043..7bab1623 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-01 20:17+0200\n"
-"PO-Revision-Date: 2020-06-20 19:06+0800\n"
+"POT-Creation-Date: 2021-02-02 18:58+0100\n"
+"PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_CN\n"
 "Language-Team: zh_Hans_CN <LL@li.org>\n"
@@ -16,382 +16,427 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr "已安装"
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr "未安装"
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "重新连接成功"
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
-msgstr "UI配置"
+msgstr "界面配置"
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "您确定删除Kobo Token吗？"
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "您确定要删除此书架吗？"
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "隐藏"
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "显示"
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr "LDAP证书路径无效，请输入正确的路径"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "设置数据库不可写入"
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr "此邮箱的账号已经存在。"
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "错误：%(ldaperror)s"
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "错误：在LDAP服务器的响应中没有返回用户"
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr "创建至少一个LDAP用户失败"
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "数据库中没有找到至少一个LDAP用户"
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr "未配置"
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s 不是一种有效语言"
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "标识符不区分大小写，覆盖旧标识符"
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "移动文件失败 %(file)s：%(error)s"
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -400,184 +445,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
 
-#: cps/helper.py:89
+#: cps/helper.py:86 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:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "发送到Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "此邮件已经通过Calibre-Web发送。"
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "发送到Kindle"
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "此邮件已经通过Calibre-Web发送。"
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "发送 %(format)s 到Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "邮件：%(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr ""
+msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "删除书籍 %(id)s失败，书籍路径无效：%(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "将标题从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "将作者从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "从“%(src)s”重命名为“%(dest)s”失败，出错信息：%(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
-msgstr "仅将jpg、jpeg、png、webp文件作为封面文件"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "邮件： "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "转换： "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "上传： "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "未知任务： "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
@@ -586,540 +610,555 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "使用Github登录失败。"
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "从Github获取用户信息失败。"
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "使用Google登录失败。"
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "从Google获取用户信息失败。"
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "链接到%(oauth)s成功"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "登录失败，没有用户与OAuth帐户关联"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "取消链接到%(oauth)s成功"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "取消链接到%(oauth)s失败"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr ""
+msgstr "为连接到%(oauth)s"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth 错误，请重试。"
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth 错误，请重试。"
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr "登录"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "找不到Token"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "Token已过期"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "成功！请返回您的设备"
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr "归档书籍"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "显示归档书籍"
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "公共书架：%(title)s已经存在已经存在。"
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "创建书架"
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "私有书架：%(title)s已经存在已经存在。"
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "编辑书架"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr "发生错误"
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr "创建书架"
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
-msgstr "编辑书架"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "发生错误"
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "书架：%(name)s"
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "打开书架出错。书架不存在或不可访问"
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "私有书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "隐藏书籍"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/ub.py:65
-msgid "Recently Added"
-msgstr "最近添加"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "书架：%(name)s"
 
-#: cps/ub.py:67
-msgid "Show recent books"
-msgstr "显示最近书籍"
+#: cps/shelf.py:427
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr "热门书籍"
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr "显示热门书籍"
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr "最高评分书籍"
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr "显示最高评分书籍"
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr "已读书籍"
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr "显示阅读状态"
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr "未读书籍"
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr "显示未读"
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr "发现"
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr "显示随机书籍"
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr "分类"
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr "显示分类选择"
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr "丛书"
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr "显示丛书选择"
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr "作者"
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr "显示作者选择"
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr "出版社"
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr "显示出版社选择"
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr "语言"
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr "显示语言选择"
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr "评分"
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr "显示评分选择"
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr "文件格式"
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr "显示文件格式选择"
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr "归档书籍"
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr "显示归档书籍"
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "读取更新信息时出现意外数据"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "无可用更新。您已经安装了最新版本"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "有新的更新。单击下面的按钮以更新到最新版本。"
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "无法获取更新信息"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "点击下面按钮更新到最新稳定版本。"
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr "创建至少一个LDAP用户失败"
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "数据库中没有找到至少一个LDAP用户"
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr "用户成功导入"
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr "最近添加的书籍"
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:688
-msgid "Books"
-msgstr "书籍"
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s 下载过的书籍"
+
+#: cps/web.py:498
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/web.py:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr "评分列表"
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr "文件格式列表"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr "任务列表"
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr "搜索"
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr "出版时间晚于 "
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr "出版时间早于 "
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "评分 <= %(rating)s"
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "评分 >= %(rating)s"
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr "搜索"
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr "高级搜索"
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr "搜索"
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr "评分列表"
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr "文件格式列表"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr "任务列表"
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr "出版时间晚于 "
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr "出版时间早于 "
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "评分 <= %(rating)s"
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "评分 >= %(rating)s"
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1308
+#: cps/web.py:1250
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr "这个用户名或者邮箱已被使用。"
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr "登录"
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr "找不到Token"
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr "Token已过期"
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr "成功！请返回您的设备"
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "电子书转换器失败： %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr "发生未知错误，书籍转换失败"
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "电子书转换器失败： %(error)s"
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Calibre 运行失败，错误信息：%(error)s"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "用户列表"
@@ -1150,7 +1189,7 @@ msgstr "管理权限"
 #: cps/templates/admin.html:17 cps/templates/login.html:12
 #: cps/templates/login.html:13 cps/templates/user_edit.html:22
 msgid "Password"
-msgstr "有无密码"
+msgstr "密码"
 
 #: cps/templates/admin.html:18 cps/templates/layout.html:66
 msgid "Upload"
@@ -1158,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:62
 msgid "Download"
 msgstr "下载书籍"
 
@@ -1171,8 +1209,8 @@ msgid "Edit"
 msgstr "编辑书籍"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "删除数据"
 
@@ -1184,11 +1222,11 @@ msgstr "公共书架"
 msgid "Add New User"
 msgstr "添加新用户"
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr "导入LDAP用户"
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr "SMTP邮件服务器设置"
 
@@ -1196,145 +1234,150 @@ msgstr "SMTP邮件服务器设置"
 msgid "SMTP Hostname"
 msgstr "SMTP主机名"
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr "加密"
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr "SMTP用户名"
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr "发件人邮箱"
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "配置"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr "Calibre 数据库路径"
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "日志级别"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
-msgstr ""
+msgstr "扩展端口"
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr "每页书籍数"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr "上传"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr "匿名浏览"
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr "开放注册"
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr "魔法链接远程登录"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr "反向代理登录"
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr "反向代理头部名称"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr "编辑基本配置"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "编辑界面配置"
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr "查看日志文件"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr "重启"
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr "更新"
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr "详情"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 "取消"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1346,20 +1389,44 @@ msgstr "通过"
 msgid "In Library"
 msgstr "在书库"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
-msgstr "全部"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "更多"
 
@@ -1391,17 +1458,17 @@ msgstr "转换到："
 msgid "Convert book"
 msgstr "转换书籍"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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 "简介"
 
@@ -1409,15 +1476,15 @@ msgstr "简介"
 msgid "Identifiers"
 msgstr "书号"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "移除"
 
@@ -1425,7 +1492,7 @@ msgstr "移除"
 msgid "Add Identifier"
 msgstr "添加书号"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "标签"
 
@@ -1437,390 +1504,494 @@ msgstr "丛书编号"
 msgid "Rating"
 msgstr "评分"
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "从URL获取封面（JPEG - 图片将下载并存储在数据库中）"
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr "从本地磁盘上传封面"
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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 "出版社"
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "没有"
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr "上传格式"
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr "查看保存书籍"
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr "您真的确认？"
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr "此书籍将从数据库中永久删除"
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr "，包括从硬盘中"
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Kobo 重要说明：被删除的书籍将保留在任何配对的 Kobo 设备上。"
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "必须先将书籍存档并同步设备，然后才能安全地删除书籍。"
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " 搜索关键字 "
 
-#: cps/templates/book_edit.html:240
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "单击封面将元数据加载到表单"
 
-#: cps/templates/book_edit.html:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "源"
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "搜索错误！"
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "无搜索结果！请尝试另一个关键字。"
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "此栏必须填写"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "合并选中的书籍"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "删除选中的书籍"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "自动更新书名排序"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "自动更新作者排序"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "输入书名"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "书名"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr "输入书名排序"
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr "书名排序"
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr "输入作者排序"
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr "作者排序"
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr "输入作者"
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr "输入分类"
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr "输入丛书"
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr "输入书名"
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr "丛书编号"
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr "输入语言"
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr "出版日期"
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr "输入出版社"
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "您真的确认？"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr "这本书籍将被合并："
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr "合并到这本书籍："
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "合并"
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "书库配置"
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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 ""
+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:268
-msgid "LDAP Certificate Path"
-msgstr "LDAP 证书路径"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr ""
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP 验证方式"
 
-#: cps/templates/config_edit.html:275
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "匿名"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "无验证"
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "简单"
 
-#: cps/templates/config_edit.html:282
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP管理员用户名"
 
-#: cps/templates/config_edit.html:288
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP管理员密码"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP专有名称（DN）"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP用户对象过滤器"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP服务器是 OpenLDAP？"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "用户导入需要以下设置"
 
-#: cps/templates/config_edit.html:306
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "LDAP组对象过滤器"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP组名"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP组成员字段"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "获取 %(provider)s OAuth凭证"
 
-#: cps/templates/config_edit.html:326
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
-msgstr "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 客户端 Secret"
 
-#: cps/templates/config_edit.html:330
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
-msgstr "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 客户端 Secret"
 
-#: cps/templates/config_edit.html:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "扩展程序配置"
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Calibre 电子书转换器路径"
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Calibre 电子书转换器设置"
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "KEpubify 电子书转换器路径"
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrar程序路径"
 
-#: cps/templates/config_edit.html:394 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 "登录"
@@ -1829,10 +2000,6 @@ msgstr "登录"
 msgid "View Configuration"
 msgstr "查看配置"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "名称"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "随机书籍显示数量"
@@ -1841,7 +2008,7 @@ msgstr "随机书籍显示数量"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "主页中书籍作者的最大显示数量（0=不隐藏）"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr "主题"
 
@@ -1975,7 +2142,7 @@ msgstr "添加到书架"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(公共)"
 
@@ -2023,11 +2190,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "下一个"
 
@@ -2035,6 +2198,10 @@ msgstr "下一个"
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "在文本编辑器中打开.kobo/Kobo eReader.conf，添加（或编辑）:"
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr "全部"
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr "创建问题"
@@ -2043,9 +2210,23 @@ msgstr "创建问题"
 msgid "Return to Home"
 msgstr "回到首页"
 
-#: cps/templates/index.html:64
-msgid "Group by series"
-msgstr "根据丛书分组"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
+msgstr ""
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2115,8 +2296,7 @@ msgstr "书架上的书"
 msgid "Home"
 msgstr "首页"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "后退"
 
@@ -2128,12 +2308,8 @@ msgstr "切换导航"
 msgid "Search Library"
 msgstr "搜索书库"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "高级搜索"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "设置"
 
@@ -2149,7 +2325,7 @@ msgstr "注销"
 msgid "Register"
 msgstr "注册"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "正在上传..."
 
@@ -2161,27 +2337,23 @@ msgstr "请不要刷新页面"
 msgid "Browse"
 msgstr "按条件浏览"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "您的书架"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "书籍详情"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "错误"
 
@@ -2213,30 +2385,82 @@ msgstr "输出流，无法显示"
 msgid "Show Access Log: "
 msgstr "显示访问日志： "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "选择标签值显示或隐藏书籍"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "选择自定义栏目值显示或隐藏本用户书籍"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "选择标签值显示或隐藏书籍"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "选择自定义栏目值显示或隐藏本用户书籍"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "输入标签"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "添加显示或隐藏书籍的值"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "此书籍格式将从数据库中永久删除"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "此书籍将从数据库中永久删除"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "，包括从硬盘中"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Kobo 重要说明：被删除的书籍将保留在任何配对的 Kobo 设备上。"
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "必须先将书籍存档并同步设备，然后才能安全地删除书籍。"
+
+#: cps/templates/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电子书路径"
@@ -2245,99 +2469,99 @@ msgstr "Caliebre-Web电子书路径"
 msgid "Reflow text when sidebars are open."
 msgstr "打开侧栏时重排文本。"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr "上一页"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr "下一页"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr "缩放到最佳"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr "按宽度缩放"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr "按高度缩放"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr "缩放到原始大小"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr "向右旋转"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr "向左旋转"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr "翻转图片"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr "浅色"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr "深色"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr "缩放"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr "最佳"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr "宽度"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr "高度"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr "原始"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr "旋转"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr "翻转"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr "水平"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr "垂直"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr "方向"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr "从左到右"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr "从右到左"
 
@@ -2389,39 +2613,43 @@ msgstr "搜索项："
 msgid "Results for:"
 msgstr "结果："
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "出版日期从"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "出版日期到"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "排除标签"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "排除丛书"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "排除语言"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "扩展名"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "排除扩展名"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "评分大于"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "评分小于"
 
@@ -2430,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:67
-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:70
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "书架将会重所有用户中删除"
 
@@ -2453,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 "书库统计"
@@ -2474,8 +2710,8 @@ msgid "Series in this Library"
 msgstr "套丛书在此书库中"
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
-msgstr "外部依赖程序"
+msgid "System Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2553,19 +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:146
-msgid "Recent Downloads"
-msgstr "最近下载"
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr "生成Kobo Auth 地址"
 
-#: cps/templates/user_edit.html:178
-msgid "Do you really want to delete the Kobo Token?"
-msgstr "您确定删除Kobo Token吗？"
-
diff --git a/cps/ub.py b/cps/ub.py
index d5f51d51..967ac0c5 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -23,12 +23,11 @@ import sys
 import datetime
 import itertools
 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
-from werkzeug.local import LocalProxy
+from flask_login import AnonymousUserMixin, current_user
+
 try:
     from flask_dance.consumer.backend.sqla import OAuthConsumerMixin
     oauth_support = True
@@ -41,80 +40,28 @@ except ImportError:
         oauth_support = False
 from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
-from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float
+from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import backref, relationship, sessionmaker, Session
+from sqlalchemy.orm.attributes import flag_modified
+from sqlalchemy.sql.expression import func
+from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import constants
+from . import constants, logger, cli
 
+log = logger.create()
 
 session = None
 app_DB_path = None
 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-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_list', "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:
+        ids.append(element.id)
+    searched_ids[current_user.id] = ids
 
 
 class UserBase:
@@ -191,6 +138,25 @@ class UserBase:
         mct = self.allowed_column_value or ""
         return [t.strip() for t in mct.split(",")]
 
+    def get_view_property(self, page, prop):
+        if not self.view_settings.get(page):
+            return None
+        return self.view_settings[page].get(prop)
+
+    def set_view_property(self, page, prop, value):
+        if not self.view_settings.get(page):
+            self.view_settings[page] = dict()
+        self.view_settings[page][prop] = value
+        try:
+            flag_modified(self, "view_settings")
+        except AttributeError:
+            pass
+        try:
+            session.commit()
+        except (exc.OperationalError, exc.InvalidRequestError):
+            session.rollback()
+            # ToDo: Error message
+
     def __repr__(self):
         return '<User %r>' % self.nickname
 
@@ -218,7 +184,8 @@ class User(UserBase, Base):
     denied_column_value = Column(String, default="")
     allowed_column_value = Column(String, default="")
     remote_auth_token = relationship('RemoteAuthToken', backref='user', lazy='dynamic')
-    series_view = Column(String(10), default="list")
+    view_settings = Column(JSON, default={})
+
 
 
 if oauth_support:
@@ -259,7 +226,8 @@ class Anonymous(AnonymousUserMixin, UserBase):
         self.allowed_tags = data.allowed_tags
         self.denied_column_value = data.denied_column_value
         self.allowed_column_value = data.allowed_column_value
-        self.series_view = data.series_view
+        self.view_settings = data.view_settings
+
 
     def role_admin(self):
         return False
@@ -276,6 +244,20 @@ class Anonymous(AnonymousUserMixin, UserBase):
     def is_authenticated(self):
         return False
 
+    def get_view_property(self, page, prop):
+        if 'view' in flask_session:
+            if not flask_session['view'].get(page):
+                return None
+            return flask_session['view'][page].get(prop)
+        return None
+
+    def set_view_property(self, page, prop, value):
+        if 'view' in flask_session:
+            if not flask_session['view'].get(page):
+                flask_session['view'][page] = dict()
+            flask_session['view'][page][prop] = value
+        return None
+
 
 # Baseclass representing Shelfs in calibre-web in app.db
 class Shelf(Base):
@@ -455,11 +437,8 @@ class RemoteAuthToken(Base):
         return '<Token %r>' % self.id
 
 
-# Migrate database to current version, has to be updated after every database change. Currently migration from
-# everywhere to current should work. Migration is done by checking if relevant columns are existing, and than adding
-# rows with SQL commands
-def migrate_Database(session):
-    engine = session.bind
+# Add missing tables during migration of database
+def add_missing_tables(engine, session):
     if not engine.dialect.has_table(engine.connect(), "book_read_link"):
         ReadBook.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "bookmark"):
@@ -473,10 +452,14 @@ 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()
+
+
+# migrate all settings missing in registration table
+def migrate_registration_table(engine, session):
     try:
         session.query(exists().where(Registration.allow)).scalar()
         session.commit()
@@ -486,27 +469,29 @@ def migrate_Database(session):
             conn.execute("update registration set 'allow' = 1")
         session.commit()
     try:
-        session.query(exists().where(RemoteAuthToken.token_type)).scalar()
-        session.commit()
-    except exc.OperationalError:  # Database is not compatible, some columns are missing
-        with engine.connect() as conn:
-            conn.execute("ALTER TABLE remote_auth_token ADD column 'token_type' INTEGER DEFAULT 0")
-            conn.execute("update remote_auth_token set 'token_type' = 0")
-        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()
+    except exc.OperationalError:  # Database is not writeable
+        print('Settings database is not writeable. Exiting...')
+        sys.exit(2)
+
+
+# Remove login capability of user Guest
+def migrate_guest_password(engine, session):
     try:
-        session.query(exists().where(ReadBook.read_status)).scalar()
-    except exc.OperationalError:
         with engine.connect() as conn:
-            conn.execute("ALTER TABLE book_read_link ADD column 'read_status' INTEGER DEFAULT 0")
-            conn.execute("UPDATE book_read_link SET 'read_status' = 1 WHERE is_read")
-            conn.execute("ALTER TABLE book_read_link ADD column 'last_modified' DATETIME")
-            conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
-            conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")
+            conn.execute("UPDATE user SET password='' where nickname = 'Guest' and password !=''")
         session.commit()
-    test = session.query(ReadBook).filter(ReadBook.last_modified == None).all()
-    for book in test:
-        book.last_modified = datetime.datetime.utcnow()
-    session.commit()
+    except exc.OperationalError:
+        print('Settings database is not writeable. Exiting...')
+        sys.exit(2)
+
+
+def migrate_shelfs(engine, session):
     try:
         session.query(exists().where(Shelf.uuid)).scalar()
     except exc.OperationalError:
@@ -522,18 +507,51 @@ 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:
         session.query(exists().where(BookShelf.order)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE book_shelf_link ADD column 'order' INTEGER DEFAULT 1")
         session.commit()
+
+
+def migrate_readBook(engine, session):
+    try:
+        session.query(exists().where(ReadBook.read_status)).scalar()
+    except exc.OperationalError:
+        with engine.connect() as conn:
+            conn.execute("ALTER TABLE book_read_link ADD column 'read_status' INTEGER DEFAULT 0")
+            conn.execute("UPDATE book_read_link SET 'read_status' = 1 WHERE is_read")
+            conn.execute("ALTER TABLE book_read_link ADD column 'last_modified' DATETIME")
+            conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
+            conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")
+        session.commit()
+    test = session.query(ReadBook).filter(ReadBook.last_modified == None).all()
+    for book in test:
+        book.last_modified = datetime.datetime.utcnow()
+    session.commit()
+
+
+def migrate_remoteAuthToken(engine, session):
+    try:
+        session.query(exists().where(RemoteAuthToken.token_type)).scalar()
+        session.commit()
+    except exc.OperationalError:  # Database is not compatible, some columns are missing
+        with engine.connect() as conn:
+            conn.execute("ALTER TABLE remote_auth_token ADD column 'token_type' INTEGER DEFAULT 0")
+            conn.execute("update remote_auth_token set 'token_type' = 0")
+        session.commit()
+
+# Migrate database to current version, has to be updated after every database change. Currently migration from
+# everywhere to current should work. Migration is done by checking if relevant columns are existing, and than adding
+# rows with SQL commands
+def migrate_Database(session):
+    engine = session.bind
+    add_missing_tables(engine, session)
+    migrate_registration_table(engine, session)
+    migrate_readBook(engine, session)
+    migrate_remoteAuthToken(engine, session)
+    migrate_shelfs(engine, session)
     try:
         create = False
         session.query(exists().where(User.sidebar_view)).scalar()
@@ -567,10 +585,11 @@ def migrate_Database(session):
             conn.execute("ALTER TABLE user ADD column `allowed_column_value` String DEFAULT ''")
         session.commit()
     try:
-        session.query(exists().where(User.series_view)).scalar()
+        session.query(exists().where(User.view_settings)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
-            conn.execute("ALTER TABLE user ADD column `series_view` VARCHAR(10) DEFAULT 'list'")
+            conn.execute("ALTER TABLE user ADD column `view_settings` VARCHAR(10) DEFAULT '{}'")
+        session.commit()
 
     if session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
         is None:
@@ -591,26 +610,18 @@ def migrate_Database(session):
                      "locale VARCHAR(2),"
                      "sidebar_view INTEGER,"
                      "default_language VARCHAR(3),"
-                     "series_view VARCHAR(10),"
+                     "view_settings VARCHAR,"
                      "UNIQUE (nickname),"
                      "UNIQUE (email))")
             conn.execute("INSERT INTO user_id(id, nickname, email, role, password, kindle_mail,locale,"
-                     "sidebar_view, default_language, series_view) "
+                     "sidebar_view, default_language, view_settings) "
                      "SELECT id, nickname, email, role, password, kindle_mail, locale,"
                      "sidebar_view, default_language FROM user")
-        # delete old user table and rename new user_id table to user:
+            # delete old user table and rename new user_id table to user:
             conn.execute("DROP TABLE user")
             conn.execute("ALTER TABLE user_id RENAME TO user")
         session.commit()
-
-    # Remove login capability of user Guest
-    try:
-        with engine.connect() as conn:
-            conn.execute("UPDATE user SET password='' where nickname = 'Guest' and password !=''")
-        session.commit()
-    except exc.OperationalError:
-        print('Settings database is not writeable. Exiting...')
-        sys.exit(1)
+    migrate_guest_password(engine, session)
 
 
 def clean_database(session):
@@ -628,13 +639,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):
@@ -675,7 +692,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()
 
@@ -688,6 +705,21 @@ def init_db(app_db_path):
         create_admin_user(session)
         create_anonymous_user(session)
 
+    if cli.user_credentials:
+        username, password = cli.user_credentials.split(':')
+        user = session.query(User).filter(func.lower(User.nickname) == username.lower()).first()
+        if user:
+            user.password = generate_password_hash(password)
+            if session_commit() == "":
+                print("Password for user '{}' changed".format(username))
+                sys.exit(0)
+            else:
+                print("Failed changing password")
+                sys.exit(3)
+        else:
+            print("Username '{}' not valid, can't change password".format(username))
+            sys.exit(3)
+
 
 def dispose():
     global session
@@ -704,3 +736,13 @@ def dispose():
                 old_session.bind.dispose()
             except Exception:
                 pass
+
+def session_commit(success=None):
+    try:
+        session.commit()
+        if success:
+            log.info(success)
+    except (exc.OperationalError, exc.InvalidRequestError) as e:
+        session.rollback()
+        log.debug_or_exception(e)
+    return ""
diff --git a/cps/updater.py b/cps/updater.py
index e4883370..ae23fb90 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -227,6 +227,7 @@ class Updater(threading.Thread):
             os.sep + 'vendor', os.sep + 'calibre-web.log', os.sep + '.git', os.sep + 'client_secrets.json',
             os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv',
             os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2',
+            os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so'
         )
         additional_path = self.is_venv()
         if additional_path:
@@ -263,10 +264,11 @@ class Updater(threading.Thread):
                     # log_from_thread("Delete file " + item_path)
                     os.remove(item_path)
                 except OSError:
-                    logger.debug("Could not remove: %s", item_path)
+                    log.debug("Could not remove: %s", item_path)
         shutil.rmtree(source, ignore_errors=True)
 
-    def is_venv(self):
+    @staticmethod
+    def is_venv():
         if (hasattr(sys, 'real_prefix')) or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
             return os.sep + os.path.relpath(sys.prefix, constants.BASE_DIR)
         else:
diff --git a/cps/uploader.py b/cps/uploader.py
index 3f2b986a..246b3bb9 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
@@ -207,10 +199,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:
@@ -219,7 +207,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..cdba4d98
--- /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 = ''  # nosec
+    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 512ef319..c62177fc 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -22,41 +22,41 @@
 
 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 mimetypes
+import chardet  # dependency of requests
 
-from babel import Locale as LC
 from babel.dates import format_date
+from babel import Locale as LC
 from babel.core import UnknownLocaleError
-from flask import Blueprint
-from flask import render_template, request, redirect, send_from_directory, make_response, g, flash, abort, url_for
+from flask import Blueprint, jsonify
+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 werkzeug.exceptions import default_exceptions, InternalServerError
+from sqlalchemy.sql.expression import text, func, false, not_, and_
+from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.sql.functions import coalesce
-try:
-    from werkzeug.exceptions import FailedDependency
-except ImportError:
-    from werkzeug.exceptions import UnprocessableEntity as FailedDependency
+
+from .services.worker import WorkerThread
+
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash, check_password_hash
 
-from . import constants, logger, isoLanguages, services, worker, cli
-from . import searched_ids, lm, babel, db, ub, config, get_locale, app
+from . import constants, logger, isoLanguages, services
+from . import babel, db, ub, config, get_locale, app
 from . import calibre_db
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import check_valid_domain, render_task_status, json_serial, \
+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),
@@ -66,7 +66,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
@@ -77,62 +76,20 @@ 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;"
     resp.headers['X-Content-Type-Options'] = 'nosniff'
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'
     resp.headers['X-XSS-Protection'] = '1; mode=block'
-    # resp.headers['Strict-Transport-Security'] = 'max-age=31536000; includeSubDomains'
+    resp.headers['Strict-Transport-Security'] = 'max-age=31536000; includeSubDomains'
+    # log.debug(request.full_path)
     return resp
 
 web = Blueprint('web', __name__)
@@ -140,105 +97,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 current_user.role == 1
-    """
-
-    @wraps(f)
-    def inner(*args, **kwargs):
-        if not config.db_configured:
-            return f(*args, **kwargs)
-        abort(403)
-
-    return inner
 
 
 def download_required(f):
@@ -260,135 +118,14 @@ 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 ################################################################
-
-
-# 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)
-
-
-@web.before_app_request
-def before_request():
-    if current_user.is_authenticated:
-        confirm_login()
-    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')
-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(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)
-
-    for username in new_users:
-        user = username.decode('utf-8')
-        if '=' in user:
-            match = re.search("([a-zA-Z0-9-]+)=%s", config.config_ldap_user_object, re.IGNORECASE | re.UNICODE)
-            if match:
-                match_filter = match.group(1)
-                match = re.search(match_filter + "=([\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
-                if match:
-                    user = match.group(1)
-                else:
-                    log.warning("Could Not Parse LDAP User: %s", user)
-                    continue
-            else:
-                log.warning("Could Not Parse LDAP User: %s", user)
-                continue
-        if ub.session.query(ub.User).filter(ub.User.nickname == user.lower()).first():
-            log.warning("LDAP User: %s Already in Database", user)
-            continue
-        user_data = services.ldap.get_object_details(user=user,
-                                                     group=None,
-                                                     query_filter=None,
-                                                     dn_only=False)
-        if user_data:
-            content = ub.User()
-            content.nickname = user
-            content.password = ''  # dummy password which will be replaced by ldap one
-            if 'mail' in user_data:
-                content.email = user_data['mail'][0].decode('utf-8')
-                if (len(user_data['mail']) > 1):
-                    content.kindle_mail = user_data['mail'][1].decode('utf-8')
-            else:
-                log.debug('No Mail Field Found in LDAP Response')
-                content.email = user + '@email.com'
-            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()
-            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')
-    return json.dumps(showtext)
-
-
 # ################################### data provider functions #########################################################
 
 
 @web.route("/ajax/emailstat")
 @login_required
 def get_email_status_json():
-    tasks = worker.get_taskstatus()
-    answer = render_task_status(tasks)
-    js = json.dumps(answer, default=json_serial)
-    response = make_response(js)
-    response.headers["Content-Type"] = "application/json; charset=utf-8"
-    return response
+    tasks = WorkerThread.getInstance().tasks
+    return jsonify(render_task_status(tasks))
 
 
 @web.route("/ajax/bookmark/<int:book_id>/<book_format>", methods=['POST'])
@@ -399,7 +136,7 @@ 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()
+        ub.session_commit()
         return "", 204
 
     lbookmark = ub.Bookmark(user_id=current_user.id,
@@ -407,7 +144,7 @@ def bookmark(book_id, book_format):
                             format=book_format,
                             bookmark_key=bookmark_key)
     ub.session.merge(lbookmark)
-    ub.session.commit()
+    ub.session_commit("Bookmark for user {} in book {} created".format(current_user.id, book_id))
     return "", 201
 
 
@@ -432,7 +169,7 @@ 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()
+        ub.session_commit("Book {} readbit toggled".format(book_id))
     else:
         try:
             calibre_db.update_title_sort(config)
@@ -448,7 +185,7 @@ def toggle_read(book_id):
                 calibre_db.session.commit()
         except (KeyError, AttributeError):
             log.error(u"Custom Column No.%d is not exisiting in calibre database", config.config_read_column)
-        except OperationalError as e:
+        except (OperationalError, InvalidRequestError) as e:
             calibre_db.session.rollback()
             log.error(u"Read status could not set: %e", e)
 
@@ -466,27 +203,22 @@ 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()
+    ub.session_commit("Book {} archivebit toggled".format(book_id))
     return ""
 
 
 @web.route("/ajax/view", methods=["POST"])
-@login_required
+@login_required_if_no_ano
 def update_view():
-    to_save = request.form.to_dict()
-    allowed_view = ['grid', 'list']
-    if "series_view" in to_save and to_save["series_view"] in allowed_view:
-        current_user.series_view = to_save["series_view"]
-    else:
-        log.error("Invalid request received: %r %r", request, to_save)
-        return "Invalid request", 400
-
+    to_save = request.get_json()
     try:
-        ub.session.commit()
-    except InvalidRequestError:
-        log.error("Invalid request received: %r ", request, )
+        for element in to_save:
+            for param in to_save[element]:
+                current_user.set_view_property(element, param, to_save[element][param])
+    except Exception as e:
+        log.error("Could not save view_settings: %r %r: %e", request, to_save, e)
         return "Invalid request", 400
-    return "", 200
+    return "1", 200
 
 
 '''
@@ -532,7 +264,7 @@ def get_comic_book(book_id, book_format, page):
                 else:
                     b64 = extract(page).encode('base64')
                 ext = names[page].rpartition('.')[-1]
-                if ext not in ('png', 'gif', 'jpg', 'jpeg'):
+                if ext not in ('png', 'gif', 'jpg', 'jpeg', 'webp'):
                     ext = 'png'
                 extractedfile="data:image/" + ext + ";base64," + b64
                 fileData={"name": names[page], "page":page, "last":len(names)-1, "content": extractedfile}
@@ -592,8 +324,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:
@@ -610,25 +340,12 @@ def get_matching_tags():
     return json_dumps
 
 
-# ################################### View Books list ##################################################################
-
-
-@web.route("/", defaults={'page': 1})
-@web.route('/page/<int:page>')
-@login_required_if_no_ano
-def index(page):
-    entries, random, pagination = calibre_db.fill_indexpage(page, db.Books, True, [db.Books.timestamp.desc()])
-    return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=_(u"Recently Added Books"), page="root")
-
-
-@web.route('/<data>/<sort>', defaults={'page': 1, 'book_id': "1"})
-@web.route('/<data>/<sort>/', defaults={'page': 1, 'book_id': "1"})
-@web.route('/<data>/<sort>/<book_id>', defaults={'page': 1})
-@web.route('/<data>/<sort>/<book_id>/<int:page>')
-@login_required_if_no_ano
-def books_list(data, sort, book_id, page):
+def get_sort_function(sort, data):
     order = [db.Books.timestamp.desc()]
+    if sort == 'stored':
+        sort = current_user.get_view_property(data, 'stored')
+    else:
+        current_user.set_view_property(data, 'stored', sort)
     if sort == 'pubnew':
         order = [db.Books.pubdate.desc()]
     if sort == 'pubold':
@@ -641,31 +358,32 @@ def books_list(data, sort, book_id, page):
         order = [db.Books.timestamp.desc()]
     if sort == 'old':
         order = [db.Books.timestamp]
+    if sort == 'authaz':
+        order = [db.Books.author_sort.asc()]
+    if sort == 'authza':
+        order = [db.Books.author_sort.desc()]
+    if sort == 'seriesasc':
+        order = [db.Books.series_index.asc()]
+    if sort == 'seriesdesc':
+        order = [db.Books.series_index.desc()]
+    return order
+
+
+def render_books_list(data, sort, book_id, page):
+    order = get_sort_function(sort, data)
 
     if data == "rated":
-        if current_user.check_visibility(constants.SIDEBAR_BEST_RATED):
-            entries, random, pagination = calibre_db.fill_indexpage(page,
-                                                                    db.Books,
-                                                                    db.Books.ratings.any(db.Ratings.rating > 9),
-                                                                    order)
-            return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                         id=book_id, title=_(u"Top Rated Books"), page="rated")
-        else:
-            abort(404)
+        return render_rated_books(page, book_id, order=order)
     elif data == "discover":
-        if current_user.check_visibility(constants.SIDEBAR_RANDOM):
-            entries, __, pagination = calibre_db.fill_indexpage(page, db.Books, True, [func.randomblob(2)])
-            pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
-            return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
-                                         title=_(u"Discover (Random Books)"), page="discover")
-        else:
-            abort(404)
+        return render_discover_books(page, book_id)
     elif data == "unread":
         return render_read_books(page, False, order=order)
     elif data == "read":
         return render_read_books(page, True, order=order)
     elif data == "hot":
         return render_hot_books(page)
+    elif data == "download":
+        return render_downloaded_books(page, order)
     elif data == "author":
         return render_author_books(page, book_id, order)
     elif data == "publisher":
@@ -682,12 +400,42 @@ def books_list(data, sort, book_id, page):
         return render_language_books(page, book_id, order)
     elif data == "archived":
         return render_archived_books(page, order)
+    elif data == "search":
+        term = (request.args.get('query') or '')
+        offset = int(int(config.config_books_per_page) * (page - 1))
+        return render_search_results(term, offset, order, config.config_books_per_page)
+    elif data == "advsearch":
+        term = json.loads(flask_session['query'])
+        offset = int(int(config.config_books_per_page) * (page - 1))
+        return render_adv_search_results(term, offset, order, config.config_books_per_page)
     else:
-        entries, random, pagination = calibre_db.fill_indexpage(page, db.Books, True, order)
+        website = data or "newest"
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Books"), page="newest")
+                                     title=_(u"Books"), page=website)
 
 
+def render_rated_books(page, book_id, order):
+    if current_user.check_visibility(constants.SIDEBAR_BEST_RATED):
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Books.ratings.any(db.Ratings.rating > 9),
+                                                                order)
+        return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+                                     id=book_id, title=_(u"Top Rated Books"), page="rated")
+    else:
+        abort(404)
+
+
+def render_discover_books(page, book_id):
+    if current_user.check_visibility(constants.SIDEBAR_RANDOM):
+        entries, __, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, [func.randomblob(2)])
+        pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
+        return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
+                                     title=_(u"Discover (Random Books)"), page="discover")
+    else:
+        abort(404)
+
 def render_hot_books(page):
     if current_user.check_visibility(constants.SIDEBAR_HOT):
         if current_user.show_detail_random():
@@ -707,8 +455,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,
@@ -717,8 +463,37 @@ def render_hot_books(page):
         abort(404)
 
 
+def render_downloaded_books(page, order):
+    if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD):
+        if current_user.show_detail_random():
+            random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
+                .order_by(func.random()).limit(config.config_random_books)
+        else:
+            random = false()
+
+        entries, __, pagination = calibre_db.fill_indexpage(page,
+                                                            0,
+                                                            db.Books,
+                                                            ub.Downloads.user_id == int(current_user.id),
+                                                            order,
+                                                            ub.Downloads, db.Books.id == ub.Downloads.book_id)
+        for book in entries:
+            if not calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
+                             .filter(db.Books.id == book.id).first():
+                ub.delete_download(book.id)
+
+        return render_title_template('index.html',
+                                     random=random,
+                                     entries=entries,
+                                     pagination=pagination,
+                                     title=_(u"Downloaded books by %(user)s",user=current_user.nickname),
+                                     page="download")
+    else:
+        abort(404)
+
+
 def render_author_books(page, author_id, order):
-    entries, __, pagination = calibre_db.fill_indexpage(page,
+    entries, __, pagination = calibre_db.fill_indexpage(page, 0,
                                                         db.Books,
                                                         db.Books.authors.any(db.Authors.id == author_id),
                                                         [order[0], db.Series.name, db.Books.series_index],
@@ -746,7 +521,7 @@ def render_author_books(page, author_id, order):
 def render_publisher_books(page, book_id, order):
     publisher = calibre_db.session.query(db.Publishers).filter(db.Publishers.id == book_id).first()
     if publisher:
-        entries, random, pagination = calibre_db.fill_indexpage(page,
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.publishers.any(db.Publishers.id == book_id),
                                                                 [db.Series.name, order[0], db.Books.series_index],
@@ -761,10 +536,10 @@ def render_publisher_books(page, book_id, order):
 def render_series_books(page, book_id, order):
     name = calibre_db.session.query(db.Series).filter(db.Series.id == book_id).first()
     if name:
-        entries, random, pagination = calibre_db.fill_indexpage(page,
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
-                                                                [db.Books.series_index, order[0]])
+                                                                [order[0]])
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Series: %(serie)s", serie=name.name), page="series")
     else:
@@ -773,10 +548,10 @@ def render_series_books(page, book_id, order):
 
 def render_ratings_books(page, book_id, order):
     name = calibre_db.session.query(db.Ratings).filter(db.Ratings.id == book_id).first()
-    entries, random, pagination = calibre_db.fill_indexpage(page,
+    entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                             db.Books,
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
-                                                            [db.Books.timestamp.desc(), order[0]])
+                                                            [order[0]])
     if name and name.rating <= 10:
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings")
@@ -787,10 +562,10 @@ def render_ratings_books(page, book_id, order):
 def render_formats_books(page, book_id, order):
     name = calibre_db.session.query(db.Data).filter(db.Data.format == book_id.upper()).first()
     if name:
-        entries, random, pagination = calibre_db.fill_indexpage(page,
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
-                                                                [db.Books.timestamp.desc(), order[0]])
+                                                                [order[0]])
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"File format: %(format)s", format=name.format), page="formats")
     else:
@@ -800,7 +575,7 @@ def render_formats_books(page, book_id, order):
 def render_category_books(page, book_id, order):
     name = calibre_db.session.query(db.Tags).filter(db.Tags.id == book_id).first()
     if name:
-        entries, random, pagination = calibre_db.fill_indexpage(page,
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0], db.Series.name, db.Books.series_index],
@@ -820,27 +595,212 @@ def render_language_books(page, name, order):
             lang_name = _(isoLanguages.get(part3=name).name)
         except KeyError:
             abort(404)
-    entries, random, pagination = calibre_db.fill_indexpage(page,
+    entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
-                                                            [db.Books.timestamp.desc(), order[0]])
+                                                            [order[0]])
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language")
 
 
-'''@web.route("/table")
+def render_read_books(page, are_read, as_xml=False, order=None):
+    order = order or []
+    if not config.config_read_column:
+        if are_read:
+            db_filter = and_(ub.ReadBook.user_id == int(current_user.id),
+                             ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED)
+        else:
+            db_filter = coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db_filter,
+                                                                order,
+                                                                ub.ReadBook, db.Books.id == ub.ReadBook.book_id)
+    else:
+        try:
+            if are_read:
+                db_filter = db.cc_classes[config.config_read_column].value == True
+            else:
+                db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True
+            entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                    db.Books,
+                                                                    db_filter,
+                                                                    order,
+                                                                    db.cc_classes[config.config_read_column])
+        except (KeyError, AttributeError):
+            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            if not as_xml:
+                flash(_("Custom Column No.%(column)d is not existing in calibre database",
+                        column=config.config_read_column),
+                      category="error")
+                return redirect(url_for("web.index"))
+            # ToDo: Handle error Case for opds
+    if as_xml:
+        return entries, pagination
+    else:
+        if are_read:
+            name = _(u'Read Books') + ' (' + str(pagination.total_count) + ')'
+            pagename = "read"
+        else:
+            name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
+            pagename = "unread"
+        return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+                                     title=name, page=pagename)
+
+
+def render_archived_books(page, order):
+    order = order or []
+    archived_books = (
+        ub.session.query(ub.ArchivedBook)
+        .filter(ub.ArchivedBook.user_id == int(current_user.id))
+        .filter(ub.ArchivedBook.is_archived == True)
+        .all()
+    )
+    archived_book_ids = [archived_book.book_id for archived_book in archived_books]
+
+    archived_filter = db.Books.id.in_(archived_book_ids)
+
+    entries, random, pagination = calibre_db.fill_indexpage_with_archived_books(page, 0,
+                                                                                db.Books,
+                                                                                archived_filter,
+                                                                                order,
+                                                                                allow_show_archived=True)
+
+    name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
+    pagename = "archived"
+    return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+                                 title=name, page=pagename)
+
+
+def render_prepare_search_form(cc):
+    # prepare data for search-form
+    tags = calibre_db.session.query(db.Tags)\
+        .join(db.books_tags_link)\
+        .join(db.Books)\
+        .filter(calibre_db.common_filters()) \
+        .group_by(text('books_tags_link.tag'))\
+        .order_by(db.Tags.name).all()
+    series = calibre_db.session.query(db.Series)\
+        .join(db.books_series_link)\
+        .join(db.Books)\
+        .filter(calibre_db.common_filters()) \
+        .group_by(text('books_series_link.series'))\
+        .order_by(db.Series.name)\
+        .filter(calibre_db.common_filters()).all()
+    extensions = calibre_db.session.query(db.Data)\
+        .join(db.Books)\
+        .filter(calibre_db.common_filters()) \
+        .group_by(db.Data.format)\
+        .order_by(db.Data.format).all()
+    if current_user.filter_language() == u"all":
+        languages = calibre_db.speaking_language()
+    else:
+        languages = None
+    return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
+                                 series=series, title=_(u"Advanced Search"), cc=cc, page="advsearch")
+
+
+def render_search_results(term, offset=None, order=None, limit=None):
+    entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
+    return render_title_template('search.html',
+                                 searchterm=term,
+                                 pagination=pagination,
+                                 query=term,
+                                 adv_searchterm=term,
+                                 entries=entries,
+                                 result_count=result_count,
+                                 title=_(u"Search"),
+                                 page="search")
+
+
+# ################################### View Books list ##################################################################
+
+
+@web.route("/", defaults={'page': 1})
+@web.route('/page/<int:page>')
 @login_required_if_no_ano
+def index(page):
+    sort_param = (request.args.get('sort') or 'stored').lower()
+    return render_books_list("newest", sort_param, 1, page)
+
+
+@web.route('/<data>/<sort_param>', defaults={'page': 1, 'book_id': 1})
+@web.route('/<data>/<sort_param>/', defaults={'page': 1, 'book_id': 1})
+@web.route('/<data>/<sort_param>/<book_id>', defaults={'page': 1})
+@web.route('/<data>/<sort_param>/<book_id>/<int:page>')
+@login_required_if_no_ano
+def books_list(data, sort_param, book_id, page):
+    return render_books_list(data, sort_param, book_id, page)
+
+
+@web.route("/table")
+@login_required
 def books_table():
-    return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
-                                 title=_(u"Language: %(name)s", name=lang_name), page="language")'''
+    visibility = current_user.view_settings.get('table', {})
+    return render_title_template('book_table.html', title=_(u"Books List"), page="book_table",
+                                 visiblility=visibility)
+
+@web.route("/ajax/listbooks")
+@login_required
+def list_books():
+    off = request.args.get("offset") or 0
+    limit = request.args.get("limit") or config.config_books_per_page
+    # sort = request.args.get("sort")
+    if request.args.get("order") == 'desc':
+        order = [db.Books.timestamp.desc()]
+    else:
+        order = [db.Books.timestamp.asc()]
+    search = request.args.get("search")
+    total_count = calibre_db.session.query(db.Books).count()
+    if search:
+        entries, filtered_count, __ = calibre_db.get_search_results(search, off, order, limit)
+    else:
+        entries, __, __ = calibre_db.fill_indexpage((int(off) / (int(limit)) + 1), limit, db.Books, True, order)
+        filtered_count = total_count
+    for entry in entries:
+        for index in range(0, len(entry.languages)):
+            try:
+                entry.languages[index].language_name = LC.parse(entry.languages[index].lang_code)\
+                    .get_language_name(get_locale())
+            except UnknownLocaleError:
+                entry.languages[index].language_name = _(
+                    isoLanguages.get(part3=entry.languages[index].lang_code).name)
+    table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": entries}
+    js_list = json.dumps(table_entries, cls=db.AlchemyEncoder)
+
+    response = make_response(js_list)
+    response.headers["Content-Type"] = "application/json; charset=utf-8"
+    return response
+
+@web.route("/ajax/table_settings", methods=['POST'])
+@login_required
+def update_table_settings():
+    # vals = request.get_json()
+    # ToDo: Save table settings
+    current_user.view_settings['table'] = json.loads(request.data)
+    try:
+        try:
+            flag_modified(current_user, "view_settings")
+        except AttributeError:
+            pass
+        ub.session.commit()
+    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():
     if current_user.check_visibility(constants.SIDEBAR_AUTHOR):
+        if current_user.get_view_property('author', 'dir') == 'desc':
+            order = db.Authors.sort.desc()
+        else:
+            order = db.Authors.sort.asc()
         entries = calibre_db.session.query(db.Authors, func.count('books_authors_link.book').label('count')) \
             .join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters()) \
-            .group_by(text('books_authors_link.author')).order_by(db.Authors.sort).all()
+            .group_by(text('books_authors_link.author')).order_by(order).all()
         charlist = calibre_db.session.query(func.upper(func.substr(db.Authors.sort, 1, 1)).label('char')) \
             .join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(func.upper(func.substr(db.Authors.sort, 1, 1))).all()
@@ -855,10 +815,14 @@ def author_list():
 @web.route("/publisher")
 @login_required_if_no_ano
 def publisher_list():
+    if current_user.get_view_property('publisher', 'dir') == 'desc':
+        order = db.Publishers.name.desc()
+    else:
+        order = db.Publishers.name.asc()
     if current_user.check_visibility(constants.SIDEBAR_PUBLISHER):
         entries = calibre_db.session.query(db.Publishers, func.count('books_publishers_link.book').label('count')) \
             .join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
-            .group_by(text('books_publishers_link.publisher')).order_by(db.Publishers.name).all()
+            .group_by(text('books_publishers_link.publisher')).order_by(order).all()
         charlist = calibre_db.session.query(func.upper(func.substr(db.Publishers.name, 1, 1)).label('char')) \
             .join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(func.upper(func.substr(db.Publishers.name, 1, 1))).all()
@@ -872,10 +836,14 @@ def publisher_list():
 @login_required_if_no_ano
 def series_list():
     if current_user.check_visibility(constants.SIDEBAR_SERIES):
-        if current_user.series_view == 'list':
+        if current_user.get_view_property('series', 'dir') == 'desc':
+            order = db.Series.sort.desc()
+        else:
+            order = db.Series.sort.asc()
+        if current_user.get_view_property('series', 'series_view') == 'list':
             entries = calibre_db.session.query(db.Series, func.count('books_series_link.book').label('count')) \
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
-                .group_by(text('books_series_link.series')).order_by(db.Series.sort).all()
+                .group_by(text('books_series_link.series')).order_by(order).all()
             charlist = calibre_db.session.query(func.upper(func.substr(db.Series.sort, 1, 1)).label('char')) \
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
                 .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
@@ -884,7 +852,7 @@ def series_list():
         else:
             entries = calibre_db.session.query(db.Books, func.count('books_series_link').label('count')) \
                 .join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters()) \
-                .group_by(text('books_series_link.series')).order_by(db.Series.sort).all()
+                .group_by(text('books_series_link.series')).order_by(order).all()
             charlist = calibre_db.session.query(func.upper(func.substr(db.Series.sort, 1, 1)).label('char')) \
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
                 .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
@@ -899,10 +867,14 @@ def series_list():
 @login_required_if_no_ano
 def ratings_list():
     if current_user.check_visibility(constants.SIDEBAR_RATING):
+        if current_user.get_view_property('ratings', 'dir') == 'desc':
+            order = db.Ratings.rating.desc()
+        else:
+            order = db.Ratings.rating.asc()
         entries = calibre_db.session.query(db.Ratings, func.count('books_ratings_link.book').label('count'),
                                    (db.Ratings.rating / 2).label('name')) \
             .join(db.books_ratings_link).join(db.Books).filter(calibre_db.common_filters()) \
-            .group_by(text('books_ratings_link.rating')).order_by(db.Ratings.rating).all()
+            .group_by(text('books_ratings_link.rating')).order_by(order).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"Ratings list"), page="ratingslist", data="ratings")
     else:
@@ -913,11 +885,15 @@ def ratings_list():
 @login_required_if_no_ano
 def formats_list():
     if current_user.check_visibility(constants.SIDEBAR_FORMAT):
+        if current_user.get_view_property('ratings', 'dir') == 'desc':
+            order = db.Data.format.desc()
+        else:
+            order = db.Data.format.asc()
         entries = calibre_db.session.query(db.Data,
                                            func.count('data.book').label('count'),
                                            db.Data.format.label('format')) \
             .join(db.Books).filter(calibre_db.common_filters()) \
-            .group_by(db.Data.format).order_by(db.Data.format).all()
+            .group_by(db.Data.format).order_by(order).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"File formats list"), page="formatslist", data="formats")
     else:
@@ -957,8 +933,12 @@ def language_overview():
 @login_required_if_no_ano
 def category_list():
     if current_user.check_visibility(constants.SIDEBAR_CATEGORY):
+        if current_user.get_view_property('category', 'dir') == 'desc':
+            order = db.Tags.name.desc()
+        else:
+            order = db.Tags.name.asc()
         entries = calibre_db.session.query(db.Tags, func.count('books_tags_link.book').label('count')) \
-            .join(db.books_tags_link).join(db.Books).order_by(db.Tags.name).filter(calibre_db.common_filters()) \
+            .join(db.books_tags_link).join(db.Books).order_by(order).filter(calibre_db.common_filters()) \
             .group_by(text('books_tags_link.tag')).all()
         charlist = calibre_db.session.query(func.upper(func.substr(db.Tags.name, 1, 1)).label('char')) \
             .join(db.books_tags_link).join(db.Books).filter(calibre_db.common_filters()) \
@@ -976,7 +956,7 @@ def category_list():
 @login_required
 def get_tasks_status():
     # if current user admin, show all email, otherwise only own emails
-    tasks = worker.get_taskstatus()
+    tasks = WorkerThread.getInstance().tasks
     answer = render_task_status(tasks)
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
@@ -989,55 +969,203 @@ def reconnect():
 
 # ################################### Search functions ################################################################
 
-
 @web.route("/search", methods=["GET"])
 @login_required_if_no_ano
 def search():
     term = request.args.get("query")
     if term:
-        entries = calibre_db.get_search_results(term)
-        ids = list()
-        for element in entries:
-            ids.append(element.id)
-        searched_ids[current_user.id] = ids
-        return render_title_template('search.html',
-                                     searchterm=term,
-                                     adv_searchterm=term,
-                                     entries=entries,
-                                     title=_(u"Search"),
-                                     page="search")
+        # flask_session['query'] = json.dumps(request.form)
+        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term))
+        # return render_search_results(term, 0, None, config.config_books_per_page)
     else:
         return render_title_template('search.html',
                                      searchterm="",
+                                     result_count=0,
                                      title=_(u"Search"),
                                      page="search")
 
 
-@web.route("/advanced_search", methods=['GET'])
+@web.route("/advsearch", methods=['POST'])
 @login_required_if_no_ano
 def advanced_search():
-    # Build custom columns names
+    values = dict(request.form)
+    params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_language',
+              'exclude_language', 'include_extension', 'exclude_extension']
+    for param in params:
+        values[param] = list(request.form.getlist(param))
+    flask_session['query'] = json.dumps(values)
+    return redirect(url_for('web.books_list', data="advsearch", sort_param='stored', query=""))
+
+
+def adv_search_custom_columns(cc, term, q):
+    for c in cc:
+        custom_query = term.get('custom_column_' + str(c.id))
+        if custom_query != '' and custom_query is not None:
+            if c.datatype == 'bool':
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    db.cc_classes[c.id].value == (custom_query == "True")))
+            elif c.datatype == 'int' or c.datatype == 'float':
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    db.cc_classes[c.id].value == custom_query))
+            elif c.datatype == 'rating':
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    db.cc_classes[c.id].value == int(float(custom_query) * 2)))
+            else:
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%")))
+    return q
+
+
+def adv_search_language(q, include_languages_inputs, exclude_languages_inputs):
+    if current_user.filter_language() != "all":
+        q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
+    else:
+        for language in include_languages_inputs:
+            q = q.filter(db.Books.languages.any(db.Languages.id == language))
+        for language in exclude_languages_inputs:
+            q = q.filter(not_(db.Books.series.any(db.Languages.id == language)))
+    return q
+
+
+def adv_search_ratings(q, rating_high, rating_low):
+    if rating_high:
+        rating_high = int(rating_high) * 2
+        q = q.filter(db.Books.ratings.any(db.Ratings.rating <= rating_high))
+    if rating_low:
+        rating_low = int(rating_low) * 2
+        q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low))
+    return q
+
+
+def adv_search_read_status(q, read_status):
+    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)
+    return q
+
+
+def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
+    for extension in include_extension_inputs:
+        q = q.filter(db.Books.data.any(db.Data.format == extension))
+    for extension in exclude_extension_inputs:
+        q = q.filter(not_(db.Books.data.any(db.Data.format == extension)))
+    return q
+
+
+def adv_search_tag(q, include_tag_inputs, exclude_tag_inputs):
+    for tag in include_tag_inputs:
+        q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+    for tag in exclude_tag_inputs:
+        q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
+    return q
+
+
+def adv_search_serie(q, include_series_inputs, exclude_series_inputs):
+    for serie in include_series_inputs:
+        q = q.filter(db.Books.series.any(db.Series.id == serie))
+    for serie in exclude_series_inputs:
+        q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
+    return q
+
+
+def extend_search_term(searchterm,
+                       author_name,
+                       book_title,
+                       publisher,
+                       pub_start,
+                       pub_end,
+                       include_tag_inputs,
+                       exclude_tag_inputs,
+                       include_series_inputs,
+                       exclude_series_inputs,
+                       include_languages_inputs,
+                       rating_high,
+                       rating_low,
+                       read_status,
+                       include_extension_inputs,
+                       exclude_extension_inputs
+                       ):
+    searchterm.extend((author_name.replace('|', ','), book_title, publisher))
+    if pub_start:
+        try:
+            searchterm.extend([_(u"Published after ") +
+                               format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
+                                           format='medium', locale=get_locale())])
+        except ValueError:
+            pub_start = u""
+    if pub_end:
+        try:
+            searchterm.extend([_(u"Published before ") +
+                               format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
+                                           format='medium', locale=get_locale())])
+        except ValueError:
+            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:
+        language_names = calibre_db.speaking_language(language_names)
+    searchterm.extend(language.name for language in language_names)
+    if rating_high:
+        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
+    searchterm = " + ".join(filter(None, searchterm))
+    return searchterm, pub_start, pub_end
+
+
+def render_adv_search_results(term, offset=None, order=None, limit=None):
+    order = order or [db.Books.sort]
+    pagination = None
+
     cc = get_cc_columns(filter_config_custom_read=True)
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
-    q = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(True)).order_by(db.Books.sort)
+    q = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(True))
 
-    include_tag_inputs = request.args.getlist('include_tag')
-    exclude_tag_inputs = request.args.getlist('exclude_tag')
-    include_series_inputs = request.args.getlist('include_serie')
-    exclude_series_inputs = request.args.getlist('exclude_serie')
-    include_languages_inputs = request.args.getlist('include_language')
-    exclude_languages_inputs = request.args.getlist('exclude_language')
-    include_extension_inputs = request.args.getlist('include_extension')
-    exclude_extension_inputs = request.args.getlist('exclude_extension')
+    include_tag_inputs = term.get('include_tag')
+    exclude_tag_inputs = term.get('exclude_tag')
+    include_series_inputs = term.get('include_serie')
+    exclude_series_inputs = term.get('exclude_serie')
+    include_languages_inputs = term.get('include_language')
+    exclude_languages_inputs = term.get('exclude_language')
+    include_extension_inputs = term.get('include_extension')
+    exclude_extension_inputs = term.get('exclude_extension')
 
-    author_name = request.args.get("author_name")
-    book_title = request.args.get("book_title")
-    publisher = request.args.get("publisher")
-    pub_start = request.args.get("Publishstart")
-    pub_end = request.args.get("Publishend")
-    rating_low = request.args.get("ratinghigh")
-    rating_high = request.args.get("ratinglow")
-    description = request.args.get("comment")
+    author_name = term.get("author_name")
+    book_title = term.get("book_title")
+    publisher = term.get("publisher")
+    pub_start = term.get("Publishstart")
+    pub_end = term.get("Publishend")
+    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:
@@ -1048,49 +1176,30 @@ def advanced_search():
     searchterm = []
     cc_present = False
     for c in cc:
-        if request.args.get('custom_column_' + str(c.id)):
-            searchterm.extend([(u"%s: %s" % (c.name, request.args.get('custom_column_' + str(c.id))))])
+        if term.get('custom_column_' + str(c.id)):
+            searchterm.extend([(u"%s: %s" % (c.name, term.get('custom_column_' + str(c.id))))])
             cc_present = True
 
     if include_tag_inputs or exclude_tag_inputs or include_series_inputs or exclude_series_inputs or \
-        include_languages_inputs or exclude_languages_inputs or author_name or book_title or \
-        publisher or pub_start or pub_end or rating_low or rating_high or description or cc_present or \
-        include_extension_inputs or exclude_extension_inputs:
-        searchterm = []
-        searchterm.extend((author_name.replace('|', ','), book_title, publisher))
-        if pub_start:
-            try:
-                searchterm.extend([_(u"Published after ") +
-                                   format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
-                                               format='medium', locale=get_locale())])
-            except ValueError:
-                pub_start = u""
-        if pub_end:
-            try:
-                searchterm.extend([_(u"Published before ") +
-                                   format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
-                                               format='medium', locale=get_locale())])
-            except ValueError:
-                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)
-        serie_names = calibre_db.session.query(db.Series).filter(db.Series.id.in_(include_series_inputs)).all()
-        searchterm.extend(serie.name for serie in serie_names)
-        language_names = calibre_db.session.query(db.Languages).filter(db.Languages.id.in_(include_languages_inputs)).all()
-        if language_names:
-            language_names = calibre_db.speaking_language(language_names)
-        searchterm.extend(language.name for language in language_names)
-        if rating_high:
-            searchterm.extend([_(u"Rating <= %(rating)s", rating=rating_high)])
-        if rating_low:
-            searchterm.extend([_(u"Rating >= %(rating)s", rating=rating_low)])
-        searchterm.extend(ext for ext in include_extension_inputs)
-        searchterm.extend(ext for ext in exclude_extension_inputs)
-        # handle custom columns
-        for c in cc:
-            if request.args.get('custom_column_' + str(c.id)):
-                searchterm.extend([(u"%s: %s" % (c.name, request.args.get('custom_column_' + str(c.id))))])
-        searchterm = " + ".join(filter(None, searchterm))
+            include_languages_inputs or exclude_languages_inputs or author_name or book_title or \
+            publisher or pub_start or pub_end or rating_low or rating_high or description or cc_present or \
+            include_extension_inputs or exclude_extension_inputs or read_status:
+        searchterm, pub_start, pub_end = extend_search_term(searchterm,
+                                                            author_name,
+                                                            book_title,
+                                                            publisher,
+                                                            pub_start,
+                                                            pub_end,
+                                                            include_tag_inputs,
+                                                            exclude_tag_inputs,
+                                                            include_series_inputs,
+                                                            exclude_series_inputs,
+                                                            include_languages_inputs,
+                                                            rating_high,
+                                                            rating_low,
+                                                            read_status,
+                                                            include_extension_inputs,
+                                                            exclude_extension_inputs)
         q = q.filter()
         if author_name:
             q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
@@ -1100,153 +1209,48 @@ def advanced_search():
             q = q.filter(db.Books.pubdate >= pub_start)
         if pub_end:
             q = q.filter(db.Books.pubdate <= pub_end)
+        q = adv_search_read_status(q, read_status)
         if publisher:
             q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
-        for tag in include_tag_inputs:
-            q = q.filter(db.Books.tags.any(db.Tags.id == tag))
-        for tag in exclude_tag_inputs:
-            q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
-        for serie in include_series_inputs:
-            q = q.filter(db.Books.series.any(db.Series.id == serie))
-        for serie in exclude_series_inputs:
-            q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
-        for extension in include_extension_inputs:
-            q = q.filter(db.Books.data.any(db.Data.format == extension))
-        for extension in exclude_extension_inputs:
-            q = q.filter(not_(db.Books.data.any(db.Data.format == extension)))
-        if current_user.filter_language() != "all":
-            q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
-        else:
-            for language in include_languages_inputs:
-                q = q.filter(db.Books.languages.any(db.Languages.id == language))
-            for language in exclude_languages_inputs:
-                q = q.filter(not_(db.Books.series.any(db.Languages.id == language)))
-        if rating_high:
-            rating_high = int(rating_high) * 2
-            q = q.filter(db.Books.ratings.any(db.Ratings.rating <= rating_high))
-        if rating_low:
-            rating_low = int(rating_low) * 2
-            q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low))
+        q = adv_search_tag(q, include_tag_inputs, exclude_tag_inputs)
+        q = adv_search_serie(q, include_series_inputs, exclude_series_inputs)
+        q = adv_search_extension(q, include_extension_inputs, exclude_extension_inputs)
+        q = adv_search_language(q, include_languages_inputs, exclude_languages_inputs)
+        q = adv_search_ratings(q, rating_high, rating_low)
+
         if description:
             q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
 
         # search custom culumns
-        for c in cc:
-            custom_query = request.args.get('custom_column_' + str(c.id))
-            if custom_query != '' and custom_query is not None:
-                if c.datatype == 'bool':
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        db.cc_classes[c.id].value == (custom_query == "True")))
-                elif c.datatype == 'int' or c.datatype == 'float':
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        db.cc_classes[c.id].value == custom_query))
-                elif c.datatype == 'rating':
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        db.cc_classes[c.id].value == int(float(custom_query) * 2)))
-                else:
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%")))
-        q = q.all()
-        ids = list()
-        for element in q:
-            ids.append(element.id)
-        searched_ids[current_user.id] = ids
-        return render_title_template('search.html', adv_searchterm=searchterm,
-                                     entries=q, title=_(u"search"), page="search")
-    # prepare data for search-form
-    tags = calibre_db.session.query(db.Tags)\
-        .join(db.books_tags_link)\
-        .join(db.Books)\
-        .filter(calibre_db.common_filters()) \
-        .group_by(text('books_tags_link.tag'))\
-        .order_by(db.Tags.name).all()
-    series = calibre_db.session.query(db.Series)\
-        .join(db.books_series_link)\
-        .join(db.Books)\
-        .filter(calibre_db.common_filters()) \
-        .group_by(text('books_series_link.series'))\
-        .order_by(db.Series.name)\
-        .filter(calibre_db.common_filters()).all()
-    extensions = calibre_db.session.query(db.Data)\
-        .join(db.Books)\
-        .filter(calibre_db.common_filters()) \
-        .group_by(db.Data.format)\
-        .order_by(db.Data.format).all()
-    if current_user.filter_language() == u"all":
-        languages = calibre_db.speaking_language()
+        q = adv_search_custom_columns(cc, term, q)
+
+    q = q.order_by(*order).all()
+    flask_session['query'] = json.dumps(term)
+    ub.store_ids(q)
+    result_count = len(q)
+    if offset != None and limit != None:
+        offset = int(offset)
+        limit_all = offset + int(limit)
+        pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
     else:
-        languages = None
-    return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
-                                 series=series, title=_(u"search"), cc=cc, page="advsearch")
+        offset = 0
+        limit_all = result_count
+    return render_title_template('search.html',
+                                 adv_searchterm=searchterm,
+                                 pagination=pagination,
+                                 entries=q[offset:limit_all],
+                                 result_count=result_count,
+                                 title=_(u"Advanced Search"), page="advsearch")
 
 
-def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs):
-    order = order or []
-    if not config.config_read_column:
-        if are_read:
-            db_filter = and_(ub.ReadBook.user_id == int(current_user.id),
-                             ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED)
-        else:
-            db_filter = coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED
-        entries, random, pagination = calibre_db.fill_indexpage(page,
-                                                                db.Books,
-                                                                db_filter,
-                                                                order,
-                                                                ub.ReadBook, db.Books.id==ub.ReadBook.book_id)
-    else:
-        try:
-            if are_read:
-                db_filter = db.cc_classes[config.config_read_column].value == True
-            else:
-                db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True
-            entries, random, pagination = calibre_db.fill_indexpage(page,
-                                                                    db.Books,
-                                                                    db_filter,
-                                                                    order,
-                                                                    db.cc_classes[config.config_read_column])
-        except (KeyError, AttributeError):
-            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
-            if not as_xml:
-                flash(_("Custom Column No.%(column)d is not existing in calibre database",
-                        column=config.config_read_column),
-                      category="error")
-                return redirect(url_for("web.index"))
-            # ToDo: Handle error Case for opds
-    if as_xml:
-        return entries, pagination
-    else:
-        if are_read:
-            name = _(u'Read Books') + ' (' + str(pagination.total_count) + ')'
-            pagename = "read"
-        else:
-            name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
-            pagename = "unread"
-        return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename)
 
+@web.route("/advsearch", methods=['GET'])
+@login_required_if_no_ano
+def advanced_search_form():
+    # Build custom columns names
+    cc = get_cc_columns(filter_config_custom_read=True)
+    return render_prepare_search_form(cc)
 
-def render_archived_books(page, order):
-    order = order or []
-    archived_books = (
-        ub.session.query(ub.ArchivedBook)
-        .filter(ub.ArchivedBook.user_id == int(current_user.id))
-        .filter(ub.ArchivedBook.is_archived == True)
-        .all()
-    )
-    archived_book_ids = [archived_book.book_id for archived_book in archived_books]
-
-    archived_filter = db.Books.id.in_(archived_book_ids)
-
-    entries, random, pagination = calibre_db.fill_indexpage_with_archived_books(page,
-                                                                                db.Books,
-                                                                                archived_filter,
-                                                                                order,
-                                                                                allow_show_archived=True)
-
-    name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
-    pagename = "archived"
-    return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename)
 
 # ################################### Download/Send ##################################################################
 
@@ -1267,17 +1271,29 @@ def get_robots():
 def serve_book(book_id, book_format, anyname):
     book_format = book_format.split(".")[0]
     book = calibre_db.get_book(book_id)
-    data = calibre_db.get_book_format(book.id, book_format.upper())
+    data = calibre_db.get_book_format(book_id, book_format.upper())
+    if not data:
+        return "File not in Database"
     log.info('Serving book: %s', data.name)
     if config.config_use_google_drive:
         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':
+            try:
+                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'))
+            except FileNotFoundError:
+                return "File Not Found"
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)
 
 
+
 @web.route("/download/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/download/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1332,11 +1348,17 @@ def register():
         if config.config_register_email:
             nickname = to_save["email"]
         else:
-            nickname = to_save["nickname"]
-        if not nickname or not to_save["email"]:
+            nickname = to_save.get('nickname', None)
+        if not nickname or not to_save.get("email", None):
             flash(_(u"Please fill out all fields!"), category="error")
             return render_title_template('register.html', title=_(u"register"), page="register")
-
+        #if to_save["email"].count("@") != 1 or not \
+        # Regex according to https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email#validation
+        if not re.search(r"^[\w.!#$%&'*+\\/=?^_`{|}~-]+@[\w](?:[\w-]{0,61}[\w])?(?:\.[\w](?:[\w-]{0,61}[\w])?)*$",
+                     to_save["email"]):
+            flash(_(u"Invalid e-mail address format"), category="error")
+            log.warning('Registering failed for user "%s" e-mail address: %s', nickname, to_save["email"])
+            return render_title_template('register.html', title=_(u"register"), page="register")
 
         existing_user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == nickname
                                                          .lower()).first()
@@ -1362,7 +1384,7 @@ def register():
                     return render_title_template('register.html', title=_(u"register"), page="register")
             else:
                 flash(_(u"Your e-mail is not allowed to register"), category="error")
-                log.warning('Registering failed for user "%s" e-mail address: %s', to_save['nickname'], to_save["email"])
+                log.warning('Registering failed for user "%s" e-mail address: %s', nickname, to_save["email"])
                 return render_title_template('register.html', title=_(u"register"), page="register")
             flash(_(u"Confirmation e-mail was send to your e-mail account."), category="success")
             return redirect(url_for('web.login'))
@@ -1438,6 +1460,8 @@ def login():
                     flash(_(u"Wrong Username or Password"), category="error")
 
     next_url = request.args.get('next', default=url_for("web.index"), type=str)
+    if url_for("web.logout") == next_url:
+        next_url = url_for("web.index")
     return render_title_template('login.html',
                                  title=_(u"login"),
                                  next_url=next_url,
@@ -1457,179 +1481,104 @@ 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 #########################################################
+def change_profile_email(to_save, kobo_support, local_oauth_check, oauth_status):
+    if "email" in to_save and to_save["email"] != current_user.email:
+        if config.config_public_reg and not check_valid_domain(to_save["email"]):
+            flash(_(u"E-mail is not from valid domain"), category="error")
+            return render_title_template("user_edit.html", content=current_user,
+                                         title=_(u"%(name)s's profile", name=current_user.nickname), page="me",
+                                         kobo_support=kobo_support,
+                                         registered_oauth=local_oauth_check, oauth_status=oauth_status)
+        current_user.email = to_save["email"]
+
+def change_profile_nickname(to_save, kobo_support, local_oauth_check, translations, languages):
+    if "nickname" in to_save and to_save["nickname"] != current_user.nickname:
+        # Query User nickname, if not existing, change
+        if not ub.session.query(ub.User).filter(ub.User.nickname == to_save["nickname"]).scalar():
+            current_user.nickname = to_save["nickname"]
+        else:
+            flash(_(u"This username is already taken"), category="error")
+            return render_title_template("user_edit.html",
+                                         translations=translations,
+                                         languages=languages,
+                                         kobo_support=kobo_support,
+                                         new_user=0, content=current_user,
+                                         registered_oauth=local_oauth_check,
+                                         title=_(u"Edit User %(nick)s",
+                                                 nick=current_user.nickname),
+                                         page="edituser")
+
+
+def change_profile(kobo_support, local_oauth_check, oauth_status, translations, languages):
+    to_save = request.form.to_dict()
+    current_user.random_books = 0
+    if current_user.role_passwd() or current_user.role_admin():
+        if "password" in to_save and to_save["password"]:
+            current_user.password = generate_password_hash(to_save["password"])
+    if "kindle_mail" in to_save and to_save["kindle_mail"] != current_user.kindle_mail:
+        current_user.kindle_mail = to_save["kindle_mail"]
+    if "allowed_tags" in to_save and to_save["allowed_tags"] != current_user.allowed_tags:
+        current_user.allowed_tags = to_save["allowed_tags"].strip()
+    change_profile_email(to_save, kobo_support, local_oauth_check, oauth_status)
+    change_profile_nickname(to_save, kobo_support, local_oauth_check, translations, languages)
+    if "show_random" in to_save and to_save["show_random"] == "on":
+        current_user.random_books = 1
+    if "default_language" in to_save:
+        current_user.default_language = to_save["default_language"]
+    if "locale" in to_save:
+        current_user.locale = to_save["locale"]
+
+    val = 0
+    for key, __ in to_save.items():
+        if key.startswith('show'):
+            val += int(key[5:])
+    current_user.sidebar_view = val
+    if "Show_detail_random" in to_save:
+        current_user.sidebar_view += constants.DETAIL_RANDOM
+
+    try:
+        ub.session.commit()
+        flash(_(u"Profile updated"), category="success")
+        log.debug(u"Profile updated")
+    except IntegrityError:
+        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.")
+    except OperationalError as e:
+        ub.session.rollback()
+        log.error("Database error: %s", e)
+        flash(_(u"Database error: %(error)s.", error=e), category="error")
 
 
 @web.route("/me", methods=["GET", "POST"])
 @login_required
 def profile():
-    downloads = list()
     languages = calibre_db.speaking_language()
     translations = babel.list_translations() + [LC('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    if feature_support['oauth']:
+    if feature_support['oauth'] and config.config_login_type == 2:
         oauth_status = get_oauth_status()
+        local_oauth_check = oauth_check
     else:
         oauth_status = None
+        local_oauth_check = {}
 
-    for book in current_user.downloads:
-        downloadBook = calibre_db.get_book(book.book_id)
-        if downloadBook:
-            downloads.append(downloadBook)
-        else:
-            ub.delete_download(book.book_id)
     if request.method == "POST":
-        to_save = request.form.to_dict()
-        current_user.random_books = 0
-        if current_user.role_passwd() or current_user.role_admin():
-            if "password" in to_save and to_save["password"]:
-                current_user.password = generate_password_hash(to_save["password"])
-        if "kindle_mail" in to_save and to_save["kindle_mail"] != current_user.kindle_mail:
-            current_user.kindle_mail = to_save["kindle_mail"]
-        if "allowed_tags" in to_save and to_save["allowed_tags"] != current_user.allowed_tags:
-            current_user.allowed_tags = to_save["allowed_tags"].strip()
-        if "email" in to_save and to_save["email"] != current_user.email:
-            if config.config_public_reg and not check_valid_domain(to_save["email"]):
-                flash(_(u"E-mail is not from valid domain"), category="error")
-                return render_title_template("user_edit.html", content=current_user, downloads=downloads,
-                                             title=_(u"%(name)s's profile", name=current_user.nickname), page="me",
-                                             kobo_support=kobo_support,
-                                             registered_oauth=oauth_check, oauth_status=oauth_status)
-        if "nickname" in to_save and to_save["nickname"] != current_user.nickname:
-            # Query User nickname, if not existing, change
-            if not ub.session.query(ub.User).filter(ub.User.nickname == to_save["nickname"]).scalar():
-                current_user.nickname = to_save["nickname"]
-            else:
-                flash(_(u"This username is already taken"), category="error")
-                return render_title_template("user_edit.html",
-                                             translations=translations,
-                                             languages=languages,
-                                             kobo_support=kobo_support,
-                                             new_user=0, content=current_user,
-                                             downloads=downloads,
-                                             registered_oauth=oauth_check,
-                                             title=_(u"Edit User %(nick)s",
-                                                     nick=current_user.nickname),
-                                             page="edituser")
-            current_user.email = to_save["email"]
-        if "show_random" in to_save and to_save["show_random"] == "on":
-            current_user.random_books = 1
-        if "default_language" in to_save:
-            current_user.default_language = to_save["default_language"]
-        if "locale" in to_save:
-            current_user.locale = to_save["locale"]
-
-        val = 0
-        for key, __ in to_save.items():
-            if key.startswith('show'):
-                val += int(key[5:])
-        current_user.sidebar_view = val
-        if "Show_detail_random" in to_save:
-            current_user.sidebar_view += constants.DETAIL_RANDOM
-
-        # current_user.mature_content = "Show_mature_content" in to_save
-
-        try:
-            ub.session.commit()
-        except IntegrityError:
-            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, downloads=downloads,
-                                         translations=translations, kobo_support=kobo_support,
-                                         title=_(u"%(name)s's profile", name=current_user.nickname), page="me",
-                                         registered_oauth=oauth_check, oauth_status=oauth_status)
-        flash(_(u"Profile updated"), category="success")
-        log.debug(u"Profile updated")
-    return render_title_template("user_edit.html", translations=translations, profile=1, languages=languages,
-                                 content=current_user, downloads=downloads, kobo_support=kobo_support,
+        change_profile(kobo_support, local_oauth_check, oauth_status, translations, languages)
+    return render_title_template("user_edit.html",
+                                 translations=translations,
+                                 profile=1,
+                                 languages=languages,
+                                 content=current_user,
+                                 kobo_support=kobo_support,
                                  title=_(u"%(name)s's profile", name=current_user.nickname),
-                                 page="me", registered_oauth=oauth_check, oauth_status=oauth_status)
+                                 page="me",
+                                 registered_oauth=local_oauth_check,
+                                 oauth_status=oauth_status)
 
 
 # ###################################Show single book ##################################################################
@@ -1673,14 +1622,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"))
@@ -1739,9 +1680,18 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
-        return render_title_template('detail.html', entry=entries, audioentries=audioentries, cc=cc,
-                                     is_xhr=request.headers.get('X-Requested-With')=='XMLHttpRequest', title=entries.title, books_shelfs=book_in_shelfs,
-                                     have_read=have_read, is_archived=is_archived, kindle_list=kindle_list, reader_list=reader_list, page="book")
+        return render_title_template('detail.html',
+                                     entry=entries,
+                                     audioentries=audioentries,
+                                     cc=cc,
+                                     is_xhr=request.headers.get('X-Requested-With')=='XMLHttpRequest',
+                                     title=entries.title,
+                                     books_shelfs=book_in_shelfs,
+                                     have_read=have_read,
+                                     is_archived=is_archived,
+                                     kindle_list=kindle_list,
+                                     reader_list=reader_list,
+                                     page="book")
     else:
         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")
diff --git a/cps/worker.py b/cps/worker.py
deleted file mode 100644
index 6d17f470..00000000
--- a/cps/worker.py
+++ /dev/null
@@ -1,602 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#    Copyright (C) 2018-2019 OzzieIsaacs, bodybybuddha, janeczku
-#
-#  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 __future__ import division, print_function, unicode_literals
-import sys
-import os
-import re
-import smtplib
-import socket
-import time
-import threading
-try:
-    import queue
-except ImportError:
-    import Queue as queue
-from glob import glob
-from shutil import copyfile
-from datetime import datetime
-
-try:
-    from StringIO import StringIO
-    from email.MIMEBase import MIMEBase
-    from email.MIMEMultipart import MIMEMultipart
-    from email.MIMEText import MIMEText
-except ImportError:
-    from io import StringIO
-    from email.mime.base import MIMEBase
-    from email.mime.multipart import MIMEMultipart
-    from email.mime.text import MIMEText
-
-from email import encoders
-from email.utils import formatdate
-from email.utils import make_msgid
-from email.generator import Generator
-from flask_babel import gettext as _
-
-from . import calibre_db, db
-from . import logger, config
-from .subproc_wrapper import process_open
-from . import gdriveutils
-
-log = logger.create()
-
-chunksize = 8192
-# task 'status' consts
-STAT_WAITING = 0
-STAT_FAIL = 1
-STAT_STARTED = 2
-STAT_FINISH_SUCCESS = 3
-#taskType consts
-TASK_EMAIL = 1
-TASK_CONVERT = 2
-TASK_UPLOAD = 3
-TASK_CONVERT_ANY = 4
-
-RET_FAIL = 0
-RET_SUCCESS = 1
-
-
-def _get_main_thread():
-    for t in threading.enumerate():
-        if t.__class__.__name__ == '_MainThread':
-            return t
-    raise Exception("main thread not found?!")
-
-
-# For gdrive download book from gdrive to calibredir (temp dir for books), read contents in both cases and append
-# it in MIME Base64 encoded to
-def get_attachment(bookpath, filename):
-    """Get file as MIMEBase message"""
-    calibrepath = config.config_calibre_dir
-    if config.config_use_google_drive:
-        df = gdriveutils.getFileFromEbooksFolder(bookpath, filename)
-        if df:
-            datafile = os.path.join(calibrepath, bookpath, filename)
-            if not os.path.exists(os.path.join(calibrepath, bookpath)):
-                os.makedirs(os.path.join(calibrepath, bookpath))
-            df.GetContentFile(datafile)
-        else:
-            return None
-        file_ = open(datafile, 'rb')
-        data = file_.read()
-        file_.close()
-        os.remove(datafile)
-    else:
-        try:
-            file_ = open(os.path.join(calibrepath, bookpath, filename), 'rb')
-            data = file_.read()
-            file_.close()
-        except IOError as e:
-            log.exception(e)
-            log.error(u'The requested file could not be read. Maybe wrong permissions?')
-            return None
-
-    attachment = MIMEBase('application', 'octet-stream')
-    attachment.set_payload(data)
-    encoders.encode_base64(attachment)
-    attachment.add_header('Content-Disposition', 'attachment',
-                          filename=filename)
-    return attachment
-
-
-# Class for sending email with ability to get current progress
-class emailbase():
-
-    transferSize = 0
-    progress = 0
-
-    def data(self, msg):
-        self.transferSize = len(msg)
-        (code, resp) = smtplib.SMTP.data(self, msg)
-        self.progress = 0
-        return (code, resp)
-
-    def send(self, strg):
-        """Send `strg' to the server."""
-        log.debug('send: %r', strg[:300])
-        if hasattr(self, 'sock') and self.sock:
-            try:
-                if self.transferSize:
-                    lock=threading.Lock()
-                    lock.acquire()
-                    self.transferSize = len(strg)
-                    lock.release()
-                    for i in range(0, self.transferSize, chunksize):
-                        if isinstance(strg, bytes):
-                            self.sock.send((strg[i:i+chunksize]))
-                        else:
-                            self.sock.send((strg[i:i + chunksize]).encode('utf-8'))
-                        lock.acquire()
-                        self.progress = i
-                        lock.release()
-                else:
-                    self.sock.sendall(strg.encode('utf-8'))
-            except socket.error:
-                self.close()
-                raise smtplib.SMTPServerDisconnected('Server not connected')
-        else:
-            raise smtplib.SMTPServerDisconnected('please run connect() first')
-
-    @classmethod
-    def _print_debug(self, *args):
-        log.debug(args)
-
-    def getTransferStatus(self):
-        if self.transferSize:
-            lock2 = threading.Lock()
-            lock2.acquire()
-            value = int((float(self.progress) / float(self.transferSize))*100)
-            lock2.release()
-            return str(value) + ' %'
-        else:
-            return "100 %"
-
-
-# Class for sending email with ability to get current progress, derived from emailbase class
-class email(emailbase, smtplib.SMTP):
-
-    def __init__(self, *args, **kwargs):
-        smtplib.SMTP.__init__(self, *args, **kwargs)
-
-
-# Class for sending ssl encrypted email with ability to get current progress, , derived from emailbase class
-class email_SSL(emailbase, smtplib.SMTP_SSL):
-
-    def __init__(self, *args, **kwargs):
-        smtplib.SMTP_SSL.__init__(self, *args, **kwargs)
-
-
-#Class for all worker tasks in the background
-class WorkerThread(threading.Thread):
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self.status = 0
-        self.current = 0
-        self.last = 0
-        self.queue = list()
-        self.UIqueue = list()
-        self.asyncSMTP = None
-        self.id = 0
-        self.db_queue = queue.Queue()
-        calibre_db.add_queue(self.db_queue)
-        self.doLock = threading.Lock()
-
-    # Main thread loop starting the different tasks
-    def run(self):
-        main_thread = _get_main_thread()
-        while main_thread.is_alive():
-            try:
-                self.doLock.acquire()
-                if self.current != self.last:
-                    index = self.current
-                    log.info(index)
-                    log.info(len(self.queue))
-                    self.doLock.release()
-                    if self.queue[index]['taskType'] == TASK_EMAIL:
-                        self._send_raw_email()
-                    elif self.queue[index]['taskType'] in (TASK_CONVERT, TASK_CONVERT_ANY):
-                        self._convert_any_format()
-                    # TASK_UPLOAD is handled implicitly
-                    self.doLock.acquire()
-                    self.current += 1
-                    if self.current > self.last:
-                        self.current = self.last
-                    self.doLock.release()
-                else:
-                    self.doLock.release()
-            except Exception as e:
-                log.exception(e)
-                self.doLock.release()
-            if main_thread.is_alive():
-                time.sleep(1)
-
-    def get_send_status(self):
-        if self.asyncSMTP:
-            return self.asyncSMTP.getTransferStatus()
-        else:
-            return "0 %"
-
-    def _delete_completed_tasks(self):
-        for index, task in reversed(list(enumerate(self.UIqueue))):
-            if task['progress'] == "100 %":
-                # delete tasks
-                self.queue.pop(index)
-                self.UIqueue.pop(index)
-                # if we are deleting entries before the current index, adjust the index
-                if index <= self.current and self.current:
-                    self.current -= 1
-        self.last = len(self.queue)
-
-    def get_taskstatus(self):
-        self.doLock.acquire()
-        if self.current  < len(self.queue):
-            if self.UIqueue[self.current]['stat'] == STAT_STARTED:
-                if self.queue[self.current]['taskType'] == TASK_EMAIL:
-                    self.UIqueue[self.current]['progress'] = self.get_send_status()
-                self.UIqueue[self.current]['formRuntime'] = datetime.now() - self.queue[self.current]['starttime']
-                self.UIqueue[self.current]['rt'] = self.UIqueue[self.current]['formRuntime'].days*24*60 \
-                                                   + self.UIqueue[self.current]['formRuntime'].seconds \
-                                                   + self.UIqueue[self.current]['formRuntime'].microseconds
-        self.doLock.release()
-        return self.UIqueue
-
-    def _convert_any_format(self):
-        # convert book, and upload in case of google drive
-        self.doLock.acquire()
-        index = self.current
-        self.doLock.release()
-        self.UIqueue[index]['stat'] = STAT_STARTED
-        self.queue[index]['starttime'] = datetime.now()
-        self.UIqueue[index]['formStarttime'] = self.queue[index]['starttime']
-        curr_task = self.queue[index]['taskType']
-        filename = self._convert_ebook_format()
-        if filename:
-            if config.config_use_google_drive:
-                gdriveutils.updateGdriveCalibreFromLocal()
-            if curr_task == TASK_CONVERT:
-                self.add_email(self.queue[index]['settings']['subject'], self.queue[index]['path'],
-                                filename, self.queue[index]['settings'], self.queue[index]['kindle'],
-                                self.UIqueue[index]['user'], self.queue[index]['title'],
-                                self.queue[index]['settings']['body'], internal=True)
-
-
-    def _convert_ebook_format(self):
-        error_message = None
-        self.doLock.acquire()
-        index = self.current
-        self.doLock.release()
-        file_path = self.queue[index]['file_path']
-        book_id = self.queue[index]['bookid']
-        format_old_ext = u'.' + self.queue[index]['settings']['old_book_format'].lower()
-        format_new_ext = u'.' + self.queue[index]['settings']['new_book_format'].lower()
-
-        # check to see if destination format already exists -
-        # 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):
-            log.info("Book id %d already converted to %s", book_id, format_new_ext)
-            cur_book = calibre_db.get_book(book_id)
-            self.queue[index]['path'] = file_path
-            self.queue[index]['title'] = cur_book.title
-            self._handleSuccess()
-            return file_path + format_new_ext
-        else:
-            log.info("Book id %d - target format of %s does not exist. Moving forward with convert.",
-                     book_id,
-                     format_new_ext)
-
-        if config.config_kepubifypath and format_old_ext == '.epub' and format_new_ext == '.kepub':
-            check, error_message = self._convert_kepubify(file_path,
-                                                          format_old_ext,
-                                                          format_new_ext,
-                                                          index)
-        else:
-            # check if calibre converter-executable is existing
-            if not os.path.exists(config.config_converterpath):
-                # ToDo Text is not translated
-                self._handleError(_(u"Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
-                return
-            check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext, index)
-
-        if check == 0:
-            cur_book = calibre_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.queue[index]['settings']['new_book_format'].upper(),
-                                         book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
-                task = {'task':'add_format','id': book_id, 'format': new_format}
-                self.db_queue.put(task)
-                # To Do how to handle error?
-
-                '''cur_book.data.append(new_format)
-                try:
-                    # db.session.merge(cur_book)
-                    calibre_db.session.commit()
-                except OperationalError as e:
-                    calibre_db.session.rollback()
-                    log.error("Database error: %s", e)
-                    self._handleError(_(u"Database error: %(error)s.", error=e))
-                    return'''
-
-                self.queue[index]['path'] = cur_book.path
-                self.queue[index]['title'] = cur_book.title
-                if config.config_use_google_drive:
-                    os.remove(file_path + format_old_ext)
-                self._handleSuccess()
-                return file_path + format_new_ext
-            else:
-                error_message = format_new_ext.upper() + ' format not found on disk'
-        log.info("ebook converter failed with error while converting book")
-        if not error_message:
-            error_message = 'Ebook converter failed with unknown error'
-        self._handleError(error_message)
-        return
-
-
-    def _convert_calibre(self, file_path, format_old_ext, format_new_ext, index):
-        try:
-            # Linux py2.7 encode as list without quotes no empty element for parameters
-            # linux py3.x no encode and as list without quotes no empty element for parameters
-            # windows py2.7 encode as string with quotes empty element for parameters is okay
-            # windows py 3.x no encode and as string with quotes empty element for parameters is okay
-            # separate handling for windows and linux
-            quotes = [1, 2]
-            command = [config.config_converterpath, (file_path + format_old_ext),
-                       (file_path + format_new_ext)]
-            quotes_index = 3
-            if config.config_calibre:
-                parameters = config.config_calibre.split(" ")
-                for param in parameters:
-                    command.append(param)
-                    quotes.append(quotes_index)
-                    quotes_index += 1
-
-            p = process_open(command, quotes)
-        except OSError as e:
-            return 1, _(u"Ebook-converter failed: %(error)s", error=e)
-
-        while p.poll() is None:
-            nextline = p.stdout.readline()
-            if os.name == 'nt' and sys.version_info < (3, 0):
-                nextline = nextline.decode('windows-1252')
-            elif os.name == 'posix' and sys.version_info < (3, 0):
-                nextline = nextline.decode('utf-8')
-            log.debug(nextline.strip('\r\n'))
-            # parse progress string from calibre-converter
-            progress = re.search(r"(\d+)%\s.*", nextline)
-            if progress:
-                self.UIqueue[index]['progress'] = progress.group(1) + ' %'
-
-        # process returncode
-        check = p.returncode
-        calibre_traceback = p.stderr.readlines()
-        error_message = ""
-        for ele in calibre_traceback:
-            if sys.version_info < (3, 0):
-                ele = ele.decode('utf-8')
-            log.debug(ele.strip('\n'))
-            if not ele.startswith('Traceback') and not ele.startswith('  File'):
-                error_message = "Calibre failed with error: %s" % ele.strip('\n')
-        return check, error_message
-
-
-    def _convert_kepubify(self, file_path, format_old_ext, format_new_ext, index):
-        quotes = [1, 3]
-        command = [config.config_kepubifypath, (file_path + format_old_ext), '-o', os.path.dirname(file_path)]
-        try:
-            p = process_open(command, quotes)
-        except OSError as e:
-            return 1, _(u"Kepubify-converter failed: %(error)s", error=e)
-        self.UIqueue[index]['progress'] = '1 %'
-        while True:
-            nextline = p.stdout.readlines()
-            nextline = [x.strip('\n') for x in nextline if x != '\n']
-            if sys.version_info < (3, 0):
-                nextline = [x.decode('utf-8') for x in nextline]
-            for line in nextline:
-                log.debug(line)
-            if p.poll() is not None:
-                break
-
-        # ToD Handle
-        # process returncode
-        check = p.returncode
-
-        # move file
-        if check == 0:
-            converted_file = glob(os.path.join(os.path.dirname(file_path), "*.kepub.epub"))
-            if len(converted_file) == 1:
-                copyfile(converted_file[0], (file_path + format_new_ext))
-                os.unlink(converted_file[0])
-            else:
-                return 1, _(u"Converted file not found or more than one file in folder %(folder)s",
-                            folder=os.path.dirname(file_path))
-        return check, None
-
-
-    def add_convert(self, file_path, bookid, user_name, taskMessage, settings, kindle_mail=None):
-        self.doLock.acquire()
-        if self.last >= 20:
-            self._delete_completed_tasks()
-        # progress, runtime, and status = 0
-        self.id += 1
-        task = TASK_CONVERT_ANY
-        if kindle_mail:
-            task = TASK_CONVERT
-        self.queue.append({'file_path':file_path, 'bookid':bookid, 'starttime': 0, 'kindle': kindle_mail,
-                           'taskType': task, 'settings':settings})
-        self.UIqueue.append({'user': user_name, 'formStarttime': '', 'progress': " 0 %", 'taskMess': taskMessage,
-                             'runtime': '0 s', 'stat': STAT_WAITING,'id': self.id, 'taskType': task } )
-
-        self.last=len(self.queue)
-        self.doLock.release()
-
-    def add_email(self, subject, filepath, attachment, settings, recipient, user_name, taskMessage,
-                  text, internal=False):
-        # if more than 20 entries in the list, clean the list
-        self.doLock.acquire()
-        if self.last >= 20:
-            self._delete_completed_tasks()
-            if internal:
-                self.current-= 1
-        # progress, runtime, and status = 0
-        self.id += 1
-        self.queue.append({'subject':subject, 'attachment':attachment, 'filepath':filepath,
-                           'settings':settings, 'recipent':recipient, 'starttime': 0,
-                           'taskType': TASK_EMAIL, 'text':text})
-        self.UIqueue.append({'user': user_name, 'formStarttime': '', 'progress': " 0 %", 'taskMess': taskMessage,
-                             'runtime': '0 s', 'stat': STAT_WAITING,'id': self.id, 'taskType': TASK_EMAIL })
-        self.last=len(self.queue)
-        self.doLock.release()
-
-    def add_upload(self, user_name, taskMessage):
-        # if more than 20 entries in the list, clean the list
-        self.doLock.acquire()
-
-
-        if self.last >= 20:
-            self._delete_completed_tasks()
-        # progress=100%, runtime=0, and status finished
-        self.id += 1
-        starttime = datetime.now()
-        self.queue.append({'starttime': starttime, 'taskType': TASK_UPLOAD})
-        self.UIqueue.append({'user': user_name, 'formStarttime': starttime, 'progress': "100 %", 'taskMess': taskMessage,
-                             'runtime': '0 s', 'stat': STAT_FINISH_SUCCESS,'id': self.id, 'taskType': TASK_UPLOAD})
-        self.last=len(self.queue)
-        self.doLock.release()
-
-    def _send_raw_email(self):
-        self.doLock.acquire()
-        index = self.current
-        self.doLock.release()
-        self.queue[index]['starttime'] = datetime.now()
-        self.UIqueue[index]['formStarttime'] = self.queue[index]['starttime']
-        self.UIqueue[index]['stat'] = STAT_STARTED
-        obj=self.queue[index]
-        # create MIME message
-        msg = MIMEMultipart()
-        msg['Subject'] = self.queue[index]['subject']
-        msg['Message-Id'] = make_msgid('calibre-web')
-        msg['Date'] = formatdate(localtime=True)
-        text = self.queue[index]['text']
-        msg.attach(MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8'))
-        if obj['attachment']:
-            result = get_attachment(obj['filepath'], obj['attachment'])
-            if result:
-                msg.attach(result)
-            else:
-                self._handleError(u"Attachment not found")
-                return
-
-        msg['From'] = obj['settings']["mail_from"]
-        msg['To'] = obj['recipent']
-
-        use_ssl = int(obj['settings'].get('mail_use_ssl', 0))
-        try:
-            # convert MIME message to string
-            fp = StringIO()
-            gen = Generator(fp, mangle_from_=False)
-            gen.flatten(msg)
-            msg = fp.getvalue()
-
-            # send email
-            timeout = 600  # set timeout to 5mins
-
-            # redirect output to logfile on python2 pn python3 debugoutput is caught with overwritten
-            # _print_debug function
-            if sys.version_info < (3, 0):
-                org_smtpstderr = smtplib.stderr
-                smtplib.stderr = logger.StderrLogger('worker.smtp')
-
-            if use_ssl == 2:
-                self.asyncSMTP = email_SSL(obj['settings']["mail_server"], obj['settings']["mail_port"], timeout=timeout)
-            else:
-                self.asyncSMTP = email(obj['settings']["mail_server"], obj['settings']["mail_port"], timeout=timeout)
-
-            # link to logginglevel
-            if logger.is_debug_enabled():
-                self.asyncSMTP.set_debuglevel(1)
-            if use_ssl == 1:
-                self.asyncSMTP.starttls()
-            if obj['settings']["mail_password"]:
-                self.asyncSMTP.login(str(obj['settings']["mail_login"]), str(obj['settings']["mail_password"]))
-            self.asyncSMTP.sendmail(obj['settings']["mail_from"], obj['recipent'], msg)
-            self.asyncSMTP.quit()
-            self._handleSuccess()
-
-            if sys.version_info < (3, 0):
-                smtplib.stderr = org_smtpstderr
-
-        except (MemoryError) as e:
-            log.exception(e)
-            self._handleError(u'MemoryError sending email: ' + str(e))
-            return None
-        except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
-            if hasattr(e, "smtp_error"):
-                text = e.smtp_error.decode('utf-8').replace("\n",'. ')
-            elif hasattr(e, "message"):
-                text = e.message
-            else:
-                log.exception(e)
-                text = ''
-            self._handleError(u'Smtplib Error sending email: ' + text)
-            return None
-        except (socket.error) as e:
-            self._handleError(u'Socket Error sending email: ' + e.strerror)
-            return None
-
-    def _handleError(self, error_message):
-        log.error(error_message)
-        self.doLock.acquire()
-        index = self.current
-        self.doLock.release()
-        self.UIqueue[index]['stat'] = STAT_FAIL
-        self.UIqueue[index]['progress'] = "100 %"
-        self.UIqueue[index]['formRuntime'] = datetime.now() - self.queue[index]['starttime']
-        self.UIqueue[index]['message'] = error_message
-
-    def _handleSuccess(self):
-        self.doLock.acquire()
-        index = self.current
-        self.doLock.release()
-        self.UIqueue[index]['stat'] = STAT_FINISH_SUCCESS
-        self.UIqueue[index]['progress'] = "100 %"
-        self.UIqueue[index]['formRuntime'] = datetime.now() - self.queue[index]['starttime']
-
-
-def get_taskstatus():
-    return _worker.get_taskstatus()
-
-
-def add_email(subject, filepath, attachment, settings, recipient, user_name, taskMessage, text):
-    return _worker.add_email(subject, filepath, attachment, settings, recipient, user_name, taskMessage, text)
-
-
-def add_upload(user_name, taskMessage):
-    return _worker.add_upload(user_name, taskMessage)
-
-
-def add_convert(file_path, bookid, user_name, taskMessage, settings, kindle_mail=None):
-    return _worker.add_convert(file_path, bookid, user_name, taskMessage, settings, kindle_mail)
-
-
-_worker = WorkerThread()
-_worker.start()
diff --git a/messages.pot b/messages.pot
index 76a02a44..26aaca01 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1,396 +1,441 @@
 # 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-09-01 20:17+0200\n"
+"POT-Creation-Date: 2021-02-02 18:58+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:44 cps/converter.py:33
+#: cps/about.py:44 cps/converter.py:32
 msgid "not installed"
 msgstr ""
 
-#: cps/about.py:96
+#: cps/about.py:99
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:93
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:95
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:103
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:106
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:565 cps/editbooks.py:577
-#: cps/editbooks.py:671 cps/editbooks.py:673 cps/editbooks.py:734
-#: cps/editbooks.py:750 cps/updater.py:509 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:136
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:158
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:190 cps/admin.py:714
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/admin.py:256
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:258
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:260
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:262 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:511
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:555
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:581
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:601
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:604
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
-msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+#: cps/admin.py:791
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:794
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr ""
+
+#: cps/admin.py:802
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:634
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:697 cps/admin.py:796 cps/admin.py:888 cps/admin.py:937
-#: 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:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:709
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:711
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:744
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:759 cps/web.py:1337
+#: cps/admin.py:974 cps/web.py:1279
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:762 cps/admin.py:774 cps/admin.py:780 cps/admin.py:906
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:771 cps/web.py:1578
+#: cps/admin.py:986 cps/web.py:1449
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:778 cps/admin.py:793
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:789
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:805
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:850 cps/web.py:1621
+#: cps/admin.py:1064 cps/web.py:1491
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:875 cps/admin.py:986 cps/web.py:1596
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1467
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:866 cps/web.py:1588
+#: cps/admin.py:1079 cps/web.py:1460
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:882
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:885
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/admin.py:915 cps/templates/admin.html:71
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:944
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:949
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:962
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1000 cps/web.py:1361 cps/web.py:1425
+#: cps/admin.py:1204 cps/web.py:1309 cps/web.py:1373
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1003 cps/web.py:1299
+#: cps/admin.py:1207 cps/web.py:1241
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1015
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1054
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1055
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1056
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1057
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1058
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1061 cps/admin.py:1062 cps/admin.py:1063 cps/admin.py:1064
-#: cps/admin.py:1065
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1061 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1062 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1063 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1064 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1065
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/converter.py:32
+#: cps/admin.py:1316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1320
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1389
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1391
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:31
 msgid "not configured"
 msgstr ""
 
-#: cps/converter.py:34
+#: cps/converter.py:33
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:254 cps/editbooks.py:550 cps/web.py:1644 cps/web.py:1685
-#: cps/web.py:1747
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1519 cps/web.py:1552
+#: cps/web.py:1623
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:288
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:360
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:469 cps/editbooks.py:716
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:473 cps/editbooks.py:720
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:485 cps/editbooks.py:780
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:490
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:508 cps/editbooks.py:871
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1496
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:512
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:657
+#: cps/editbooks.py:706
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr ""
+
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:666
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:787
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:843
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:883
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:891
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -399,184 +444,163 @@ 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:77
+#: cps/helper.py:80
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:89
+#: cps/helper.py:86 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr ""
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:108
+#: cps/helper.py:91
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:96 cps/helper.py:229 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr ""
+
+#: cps/helper.py:97 cps/helper.py:113 cps/helper.py:231
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:111
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:112
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:129
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:134
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:154 cps/helper.py:158 cps/helper.py:162 cps/helper.py:171
+#: cps/helper.py:175 cps/helper.py:179
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:184 cps/helper.py:190
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:226
+#: cps/helper.py:231
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr ""
 
-#: cps/helper.py:228
+#: cps/helper.py:233
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:325
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:336
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:346
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:401
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:402
+#: cps/helper.py:416
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:441 cps/helper.py:451 cps/helper.py:459
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:480
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:605
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:610
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:621
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:634
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:685
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:699
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:748
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:744
+#: cps/helper.py:750
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:746
+#: cps/helper.py:752
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:748
+#: cps/helper.py:754
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:756
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr ""
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:161
 msgid "Kobo Setup"
 msgstr ""
 
@@ -585,540 +609,555 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1397 cps/web.py:1537
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1345
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:65 cps/web.py:1392
+msgid "login"
+msgstr ""
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr ""
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr ""
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr ""
+
+#: cps/render_template.py:39 cps/web.py:424
+msgid "Books"
+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:377
+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:637
+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:640
+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:942
+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:846 cps/web.py:856
+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:825
+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:921
+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:664
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:735
+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
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:263 cps/shelf.py:312
-msgid "There was an error"
-msgstr ""
-
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
-msgid "Create a Shelf"
-msgstr ""
-
-#: cps/shelf.py:306
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:313 cps/shelf.py:315
-msgid "Edit a shelf"
+#: cps/shelf.py:265
+msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:369
+#: cps/shelf.py:281
 #, python-format
-msgid "Shelf: '%(name)s'"
+msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr ""
-
-#: cps/shelf.py:414
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/ub.py:65
-msgid "Recently Added"
+#: cps/shelf.py:423
+#, python-format
+msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/ub.py:67
-msgid "Show recent books"
+#: cps/shelf.py:427
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/templates/index.xml:17 cps/ub.py:68
-msgid "Hot Books"
-msgstr ""
-
-#: cps/ub.py:70
-msgid "Show Hot Books"
-msgstr ""
-
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:652
-msgid "Top Rated Books"
-msgstr ""
-
-#: cps/ub.py:74
-msgid "Show Top Rated Books"
-msgstr ""
-
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1219
-msgid "Read Books"
-msgstr ""
-
-#: cps/ub.py:77
-msgid "Show read and unread"
-msgstr ""
-
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1222
-msgid "Unread Books"
-msgstr ""
-
-#: cps/ub.py:81
-msgid "Show unread"
-msgstr ""
-
-#: cps/ub.py:82
-msgid "Discover"
-msgstr ""
-
-#: cps/ub.py:84
-msgid "Show random books"
-msgstr ""
-
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:967
-msgid "Categories"
-msgstr ""
-
-#: cps/ub.py:87
-msgid "Show category selection"
-msgstr ""
-
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:883 cps/web.py:893
-msgid "Series"
-msgstr ""
-
-#: cps/ub.py:90
-msgid "Show series selection"
-msgstr ""
-
-#: cps/templates/index.xml:61 cps/ub.py:91
-msgid "Authors"
-msgstr ""
-
-#: cps/ub.py:93
-msgid "Show author selection"
-msgstr ""
-
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:866
-msgid "Publishers"
-msgstr ""
-
-#: cps/ub.py:97
-msgid "Show publisher selection"
-msgstr ""
-
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:950
-msgid "Languages"
-msgstr ""
-
-#: cps/ub.py:101
-msgid "Show language selection"
-msgstr ""
-
-#: cps/templates/index.xml:96 cps/ub.py:102
-msgid "Ratings"
-msgstr ""
-
-#: cps/ub.py:104
-msgid "Show ratings selection"
-msgstr ""
-
-#: cps/templates/index.xml:104 cps/ub.py:105
-msgid "File formats"
-msgstr ""
-
-#: cps/ub.py:107
-msgid "Show file formats selection"
-msgstr ""
-
-#: cps/ub.py:109 cps/web.py:1246
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:111
-msgid "Show archived books"
-msgstr ""
-
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py: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:371
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:374
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:376
-msgid "User Successfully Imported"
-msgstr ""
-
-#: cps/web.py:622
-msgid "Recently Added Books"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:660
+#: cps/templates/index.html:5 cps/web.py:385
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:688
-msgid "Books"
-msgstr ""
-
-#: cps/web.py:715
+#: cps/web.py:449
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:728
+#: cps/web.py:484
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:498
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:512
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:756
+#: cps/web.py:526
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:769
+#: cps/web.py:539
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:782
+#: cps/web.py:552
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:795
+#: cps/web.py:565
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:809
+#: cps/web.py:579
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:828
+#: cps/web.py:598
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/web.py:907
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:922
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:981
-msgid "Tasks"
-msgstr ""
-
-#: cps/templates/book_edit.html:236 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1007 cps/web.py:1012
-msgid "Search"
-msgstr ""
-
-#: cps/web.py:1063
-msgid "Published after "
-msgstr ""
-
-#: cps/web.py:1070
-msgid "Published before "
-msgstr ""
-
-#: cps/web.py:1084
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1086
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1155 cps/web.py:1180
-msgid "search"
-msgstr ""
-
-#: cps/web.py:1210
+#: cps/web.py:628
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1304
+#: cps/templates/layout.html:56 cps/web.py:695 cps/web.py:1169
+msgid "Advanced Search"
+msgstr ""
+
+#: 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:707 cps/web.py:979
+msgid "Search"
+msgstr ""
+
+#: cps/web.py:874
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:893
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:956
+msgid "Tasks"
+msgstr ""
+
+#: cps/web.py:1042
+msgid "Published after "
+msgstr ""
+
+#: cps/web.py:1049
+msgid "Published before "
+msgstr ""
+
+#: cps/web.py:1068
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1070
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1072
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1246
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1308
+#: cps/web.py:1250
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1310
+#: cps/web.py:1252
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1327
+#: cps/web.py:1269
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1328 cps/web.py:1338 cps/web.py:1362 cps/web.py:1366
-#: cps/web.py:1371 cps/web.py:1375
+#: cps/web.py:1270 cps/web.py:1280 cps/web.py:1287 cps/web.py:1310
+#: cps/web.py:1314 cps/web.py:1319 cps/web.py:1323
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1364
+#: cps/web.py:1285
+msgid "Invalid e-mail address format"
+msgstr ""
+
+#: cps/web.py:1312
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1367
+#: cps/web.py:1315
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1370
+#: cps/web.py:1318
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1387
+#: cps/web.py:1335
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1404
+#: cps/web.py:1352
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1410
+#: cps/web.py:1358
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1414 cps/web.py:1438
+#: cps/web.py:1362 cps/web.py:1386
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1421
+#: cps/web.py:1369
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1427
+#: cps/web.py:1375
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1433
+#: cps/web.py:1381
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1442 cps/web.py:1469
-msgid "login"
-msgstr ""
-
-#: cps/web.py:1481 cps/web.py:1515
-msgid "Token not found"
-msgstr ""
-
-#: cps/web.py:1490 cps/web.py:1523
-msgid "Token has expired"
-msgstr ""
-
-#: cps/web.py:1499
-msgid "Success! Please return to your device"
-msgstr ""
-
-#: cps/web.py:1580 cps/web.py:1625 cps/web.py:1631
+#: cps/web.py:1451 cps/web.py:1504
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1627
+#: cps/web.py:1487
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1656 cps/web.py:1659 cps/web.py:1662 cps/web.py:1669
-#: cps/web.py:1674
+#: cps/web.py:1531 cps/web.py:1534 cps/web.py:1537 cps/web.py:1544
+#: cps/web.py:1549
 msgid "Read a Book"
 msgstr ""
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:138
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
+msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:142
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr ""
+
+#: cps/tasks/convert.py:224
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1157,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:62
 msgid "Download"
 msgstr ""
 
@@ -1170,8 +1208,8 @@ msgid "Edit"
 msgstr ""
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:217 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr ""
 
@@ -1183,11 +1221,11 @@ msgstr ""
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:46 cps/templates/admin.html:47
+#: cps/templates/admin.html:46
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:54
+#: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
 msgstr ""
 
@@ -1195,145 +1233,150 @@ msgstr ""
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:15
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:19
 msgid "Encryption"
 msgstr ""
 
-#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:27
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:35
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:77
+#: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:87
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:95
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:93
+#: cps/templates/admin.html:100
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+#: cps/templates/admin.html:107 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:111
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:115
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:112
+#: cps/templates/admin.html:119
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:116
+#: cps/templates/admin.html:123
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:127
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:125
+#: cps/templates/admin.html:132
 msgid "Reverse proxy header name"
 msgstr ""
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:137
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:137
+#: cps/templates/admin.html:143
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:138
+#: cps/templates/admin.html:144
+msgid "Download Debug Package"
+msgstr ""
+
+#: cps/templates/admin.html:145
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:148
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:140
+#: cps/templates/admin.html:149
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:141
+#: cps/templates/admin.html:150
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:155
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:151
+#: cps/templates/admin.html:159
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:152
+#: cps/templates/admin.html:160
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:166
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:172
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:173
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:177
+#: cps/templates/admin.html:185
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:190 cps/templates/admin.html:204
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:188 cps/templates/book_edit.html:218
-#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
-#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/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: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 ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:203
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:207
+#: cps/templates/admin.html:215
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1345,20 +1388,44 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
-msgid "All"
+#: 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:58 cps/templates/author.html:110
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
-#: cps/templates/shelf.html:36
+#: 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: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: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: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:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, oldest first"
+msgstr ""
+
+#: 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:94
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr ""
 
@@ -1390,17 +1457,17 @@ msgstr ""
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:280
-#: cps/templates/book_edit.html:298 cps/templates/search_form.html:10
+#: 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:285
-#: cps/templates/book_edit.html:300 cps/templates/search_form.html:126
+#: 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 ""
 
@@ -1408,15 +1475,15 @@ msgstr ""
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:309
+#: 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:310
+#: 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:311
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1424,7 +1491,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr ""
 
@@ -1436,390 +1503,494 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: cps/templates/book_edit.html:96
+#: cps/templates/book_edit.html:98
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
-#: cps/templates/book_edit.html:100
+#: cps/templates/book_edit.html:102
 msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:105
+#: cps/templates/book_edit.html:109
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:282
-#: cps/templates/book_edit.html:299 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: 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 ""
 
-#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:32
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
+#: 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:127 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:174
+#: cps/templates/book_edit.html:178
 msgid "Upload Format"
 msgstr ""
 
-#: cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:187
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:186 cps/templates/book_edit.html:230
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:187 cps/templates/config_edit.html:388
+#: 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:201
-msgid "Are you really sure?"
-msgstr ""
-
-#: cps/templates/book_edit.html:205
-msgid "This book will be permanently erased from database"
-msgstr ""
-
-#: cps/templates/book_edit.html:206
-msgid "and hard disk"
-msgstr ""
-
-#: cps/templates/book_edit.html:210
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
 #: cps/templates/book_edit.html:211
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:233
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr ""
 
-#: cps/templates/book_edit.html:240
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:255 cps/templates/book_edit.html:295
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:260 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html: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:287 cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:296
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:297
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr ""
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:19
+#: cps/templates/config_edit.html:18
 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 option"
+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:268
-msgid "LDAP Certificate Path"
+#: cps/templates/config_edit.html:274
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
-msgid "LDAP Authentication"
-msgstr ""
-
-#: cps/templates/config_edit.html:275
-msgid "Anonymous"
-msgstr ""
-
-#: cps/templates/config_edit.html:276
-msgid "Unauthenticated"
-msgstr ""
-
-#: cps/templates/config_edit.html:277
-msgid "Simple"
-msgstr ""
-
-#: cps/templates/config_edit.html:282
-msgid "LDAP Administrator Username"
+#: cps/templates/config_edit.html:281
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:288
-msgid "LDAP Administrator Password"
-msgstr ""
-
-#: cps/templates/config_edit.html:293
-msgid "LDAP Distinguished Name (DN)"
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
 #: cps/templates/config_edit.html:297
-msgid "LDAP User Object Filter"
+msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
-msgid "LDAP Server is OpenLDAP?"
+#: cps/templates/config_edit.html:299
+msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:304
-msgid "Following Settings are Needed For User Import"
+#: cps/templates/config_edit.html:300
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:301
+msgid "Simple"
 msgstr ""
 
 #: cps/templates/config_edit.html:306
+msgid "LDAP Administrator Username"
+msgstr ""
+
+#: cps/templates/config_edit.html:312
+msgid "LDAP Administrator Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:317
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:321
+msgid "LDAP User Object Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:326
+msgid "LDAP Server is OpenLDAP?"
+msgstr ""
+
+#: cps/templates/config_edit.html:328
+msgid "Following Settings are Needed For User Import"
+msgstr ""
+
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:342
+msgid "LDAP Member User Filter Detection"
+msgstr ""
+
+#: cps/templates/config_edit.html:344
+msgid "Autodetect"
+msgstr ""
+
+#: cps/templates/config_edit.html:345
+msgid "Custom Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:350
+msgid "LDAP Member User Filter"
+msgstr ""
+
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:326
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:330
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:346
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:352
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:360
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:363
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:371
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:394 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 ""
@@ -1828,10 +1999,6 @@ msgstr ""
 msgid "View Configuration"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr ""
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr ""
@@ -1840,7 +2007,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:113
 msgid "Theme"
 msgstr ""
 
@@ -1974,7 +2141,7 @@ msgstr ""
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2022,11 +2189,7 @@ 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:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr ""
 
@@ -2034,6 +2197,10 @@ msgstr ""
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/grid.html:14 cps/templates/list.html:14
+msgid "All"
+msgstr ""
+
 #: cps/templates/http_error.html:38
 msgid "Create Issue"
 msgstr ""
@@ -2042,8 +2209,22 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
-msgid "Group by series"
+#: 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:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
+msgid "Sort authors in reverse alphabetical order"
+msgstr ""
+
+#: cps/templates/index.html:77
+msgid "Sort ascending according to series index"
+msgstr ""
+
+#: cps/templates/index.html:78
+msgid "Sort descending according to series index"
 msgstr ""
 
 #: cps/templates/index.xml:6
@@ -2114,8 +2295,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr ""
 
@@ -2127,12 +2307,8 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr ""
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr ""
 
@@ -2148,7 +2324,7 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr ""
 
@@ -2160,27 +2336,23 @@ msgstr ""
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr ""
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr ""
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr ""
 
@@ -2212,30 +2384,82 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr ""
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/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 ""
@@ -2244,99 +2468,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:89
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:92
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:93
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:94
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:95
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:96
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:97
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:98
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:99
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:100
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:116
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:117
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:122
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:125
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:126
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:127
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:128
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:133
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:144
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:147
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:148
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:153
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:156
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:157
 msgid "Right to Left"
 msgstr ""
 
@@ -2388,39 +2612,43 @@ msgstr ""
 msgid "Results for:"
 msgstr ""
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr ""
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr ""
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr ""
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr ""
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2429,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:67
-msgid "Are you sure you want to delete this shelf?"
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr ""
 
@@ -2452,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 ""
@@ -2473,7 +2709,7 @@ msgid "Series in this Library"
 msgstr ""
 
 #: cps/templates/stats.html:29
-msgid "Linked Libraries"
+msgid "System Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:33
@@ -2552,19 +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:146
-msgid "Recent Downloads"
-msgstr ""
-
-#: cps/templates/user_edit.html:162
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
-msgid "Do you really want to delete the Kobo Token?"
-msgstr ""
-
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 6537a077..a94bb506 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,15 +1,15 @@
 # GDrive Integration
-google-api-python-client==1.7.11,<1.8.0
-gevent>=1.2.1,<20.6.0
-greenlet>=0.4.12,<0.5.0
+google-api-python-client>=1.7.11,<1.13.0
+gevent>20.6.0,<21.2.0
+greenlet>=0.4.17,<1.1.0
 httplib2>=0.9.2,<0.18.0
 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
+rsa>=3.4.2,<4.1.0
 six>=1.10.0,<1.15.0
 
 # goodreads
@@ -17,7 +17,7 @@ goodreads>=0.3.2,<0.4.0
 python-Levenshtein>=0.12.0,<0.13.0
 
 # ldap login
-python-ldap>=3.0.0,<3.3.0
+python-ldap>=3.0.0,<3.4.0
 Flask-SimpleLDAP>=1.4.0,<1.5.0
 
 #oauth
@@ -25,13 +25,12 @@ Flask-Dance>=1.4.0,<3.1.0
 SQLAlchemy-Utils>=0.33.5,<0.37.0
 
 # extracting metadata
-lxml>=3.8.0,<4.6.0
-Pillow>=4.0.0,<7.2.0
+lxml>=3.8.0,<4.7.0
 rarfile>=2.7
 
 # other
 natsort>=2.2.0,<7.1.0
-git+https://github.com/OzzieIsaacs/comicapi.git@3e15b950b72724b1b8ca619c36580b5fbaba9784#egg=comicapi
+comicapi>= 2.1.3,<2.2.0
 
 #Kobo integration
 jsonschema>=3.2.0,<3.3.0
diff --git a/requirements.txt b/requirements.txt
index e7735041..94dc7f3a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,15 @@
 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
 backports_abc>=0.4
 Flask>=1.0.2,<1.2.0
 iso-639>=0.4.5,<0.5.0
-PyPDF2==1.26.0,<1.27.0
+PyPDF2>=1.26.0,<1.27.0
 pytz>=2016.10
-requests>=2.11.1,<2.24.0
-SQLAlchemy>=1.1.0,<1.4.0
-tornado>=4.1,<6.1
-Wand>=0.4.4,<0.6.0
+requests>=2.11.1,<2.25.0
+SQLAlchemy>=1.3.0,<1.4.0
+tornado>=4.1,<6.2
+Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.2.0
diff --git a/setup.cfg b/setup.cfg
index b10c2828..88624195 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
 name = calibreweb
 url = https://github.com/janeczku/calibre-web
@@ -20,8 +17,6 @@ license_file = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     License :: OSI Approved :: GNU Affero General Public License v3
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
@@ -31,57 +26,61 @@ keywords =
   calibre
   calibre-web
   library
-python_requires = >=2.6
+python_requires = >=3.0
 
 [options.entry_points]
 console_scripts =
   cps = calibreweb:main
 [options]
 include_package_data = True
-dependency_links = comicapi @ git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi
 install_requires =
-  Babel >= 1.3
-  Flask-Babel >= 0.11.1
-  Flask-Login >= 0.3.2
-  Flask-Principal >= 0.3.2
-  singledispatch >= 3.4.0.0
-  backports_abc >= 0.4
-  Flask >= 0.11
-  iso-639 >= 0.4.5
-  PyPDF2 == 1.26.0
-  pytz >= 2016.10
-  requests >= 2.11.1
-  SQLAlchemy >= 1.1.0
-  tornado >= 4.1
-  unidecode >= 0.04.19
+    Babel>=1.3, <2.9
+    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
+    backports_abc>=0.4
+    Flask>=1.0.2,<1.2.0
+    iso-639>=0.4.5,<0.5.0
+    PyPDF2>=1.26.0,<1.27.0
+    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.7.0
+    unidecode>=0.04.19,<1.2.0
 
 [options.extras_require]
 gdrive =
-  google-api-python-client == 1.6.1
-  google-api-python-client==1.6.1
-  gevent==1.2.1
-  greenlet==0.4.12
-  httplib2==0.9.2
-  oauth2client==4.0.0
-  uritemplate==3.0.0
-  pyasn1-modules==0.0.8
-  pyasn1==0.1.9
-  PyDrive==1.3.1
-  PyYAML==3.12
-  rsa==3.4.2
-  six==1.10.0
+    google-api-python-client>=1.7.11,<1.8.0
+    gevent>=1.2.1,<20.6.0
+    greenlet>=0.4.12,<0.4.17
+    httplib2>=0.9.2,<0.18.0
+    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
+    PyDrive2>=1.3.1,<1.8.0
+    PyYAML>=3.12
+    rsa>=3.4.2,<4.1.0
+    six>=1.10.0,<1.15.0
 goodreads =
-  goodreads >= 0.3.2
-  python-Levenshtein>=0.12.0
+    goodreads>=0.3.2,<0.4.0
+    python-Levenshtein>=0.12.0,<0.13.0
+ldap =
+    python-ldap>=3.0.0,<3.3.0
+    Flask-SimpleLDAP>=1.4.0,<1.5.0
+oauth =
+    Flask-Dance>=1.4.0,<3.1.0
+    SQLAlchemy-Utils>=0.33.5,<0.37.0
 metadata =
-  lxml>=3.8.0
-  Pillow>=4.0.0
-  rarfile>=2.7
-  Wand >= 0.4.4
-comics=
-  natsort>=2.2.0
-  # find solution for this should belong to comics
-  # comicapi @ git+https://github.com/OzzieIsaacs/comicapi/archive/5346716578b2843f54d522f44d01bc8d25001d24.zip#egg=comicapi
+    lxml>=3.8.0,<4.6.0
+    rarfile>=2.7
+comics =
+    natsort>=2.2.0
+    comicapi>= 2.1.3,<2.2.0
+kobo =
+    jsonschema>=3.2.0,<3.3.0
 
 
 
diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
index 9185d2ee..10e2e0ee 100755
--- a/test/Calibre-Web TestSummary.html	
+++ b/test/Calibre-Web TestSummary.html	
@@ -36,17 +36,21 @@
       <div class="col-xs-12 col-sm-6">
       <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-08-23 18:29:00</p>
+            
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-08-30 15:47:09</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-08-23 19:44:09</p>
+            
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-08-30 17:06:27</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 212 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>1h 7 min</p>
         </div>
       </div>
       </div>
@@ -98,8 +102,8 @@
     </tr>
 
 
-    <tr class="result['header']['style']">
-        <td>test_anonymous.testAnonymous</td>
+    <tr id="su" class="passClass">
+        <td>TestAnonymous</td>
         <td class="text-center">13</td>
         <td class="text-center">13</td>
         <td class="text-center">0</td>
@@ -114,7 +118,7 @@
     
         <tr id='pt1.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_locale_guest</div>
+                <div class='testcase'>TestAnonymous - test_check_locale_guest</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -123,7 +127,7 @@
     
         <tr id='pt1.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_about</div>
+                <div class='testcase'>TestAnonymous - test_guest_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -132,7 +136,7 @@
     
         <tr id='pt1.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_category</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -141,7 +145,7 @@
     
         <tr id='pt1.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_format</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_format</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -150,7 +154,7 @@
     
         <tr id='pt1.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_hot</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_hot</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -159,7 +163,7 @@
     
         <tr id='pt1.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_language</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -168,7 +172,7 @@
     
         <tr id='pt1.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_publisher</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -177,7 +181,7 @@
     
         <tr id='pt1.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_rated</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rated</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -186,7 +190,7 @@
     
         <tr id='pt1.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_rating</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -195,7 +199,7 @@
     
         <tr id='pt1.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_series</div>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -204,7 +208,7 @@
     
         <tr id='pt1.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_random_books_available</div>
+                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -213,7 +217,7 @@
     
         <tr id='pt1.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_restricted_settings_visibility</div>
+                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -222,7 +226,7 @@
     
         <tr id='pt1.13' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_visibility_sidebar</div>
+                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -230,8 +234,8 @@
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_cli.testCli</td>
+    <tr id="su" class="skipClass">
+        <td>TestCli</td>
         <td class="text-center">7</td>
         <td class="text-center">6</td>
         <td class="text-center">0</td>
@@ -246,7 +250,7 @@
     
         <tr id='pt2.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_already_started</div>
+                <div class='testcase'>TestCli - test_already_started</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -255,7 +259,7 @@
     
         <tr id='pt2.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_bind_to_single_interface</div>
+                <div class='testcase'>TestCli - test_bind_to_single_interface</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -264,7 +268,7 @@
     
         <tr id='pt2.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_cli_SSL_files</div>
+                <div class='testcase'>TestCli - test_cli_SSL_files</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -273,7 +277,7 @@
     
         <tr id='pt2.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_cli_different_folder</div>
+                <div class='testcase'>TestCli - test_cli_different_folder</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -282,7 +286,7 @@
     
         <tr id='pt2.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_cli_different_settings_database</div>
+                <div class='testcase'>TestCli - test_cli_different_settings_database</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -291,7 +295,7 @@
     
         <tr id='st2.6' class='none bg-warning'>
             <td>
-                <div class='testcase'>test_cli_gdrive_location</div>
+                <div class='testcase'>TestCli - test_cli_gdrive_location</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -317,7 +321,7 @@
     
         <tr id='pt2.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_environ_port_setting</div>
+                <div class='testcase'>TestCli - test_environ_port_setting</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -325,8 +329,8 @@
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_cover_edit_books.testCoverEditBooks</td>
+    <tr id="su" class="failClass">
+        <td>TestCoverEditBooks</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
@@ -341,7 +345,7 @@
     
         <tr id='ft3.1' class='none bg-danger'>
             <td>
-                <div class='testcase'>test_upload_jpg</div>
+                <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -369,8 +373,8 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_delete_database.TestDeleteDatabase</td>
+    <tr id="su" class="passClass">
+        <td>TestDeleteDatabase</td>
         <td class="text-center">1</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
@@ -385,7 +389,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt4.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_delete_books_in_database</div>
+                <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -393,8 +397,8 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_ebook_convert.TestEbookConvert</td>
+    <tr id="su" class="passClass">
+        <td>TestEbookConvert</td>
         <td class="text-center">11</td>
         <td class="text-center">11</td>
         <td class="text-center">0</td>
@@ -409,7 +413,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_convert_deactivate</div>
+                <div class='testcase'>TestEbookConvert - test_convert_deactivate</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -418,7 +422,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_convert_email</div>
+                <div class='testcase'>TestEbookConvert - test_convert_email</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -427,7 +431,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_convert_failed_and_email</div>
+                <div class='testcase'>TestEbookConvert - test_convert_failed_and_email</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -436,7 +440,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_convert_only</div>
+                <div class='testcase'>TestEbookConvert - test_convert_only</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -445,7 +449,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_convert_parameter</div>
+                <div class='testcase'>TestEbookConvert - test_convert_parameter</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -454,7 +458,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_convert_wrong_excecutable</div>
+                <div class='testcase'>TestEbookConvert - test_convert_wrong_excecutable</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -463,7 +467,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_email_failed</div>
+                <div class='testcase'>TestEbookConvert - test_email_failed</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -472,7 +476,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_email_only</div>
+                <div class='testcase'>TestEbookConvert - test_email_only</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -481,7 +485,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_kindle_send_not_configured</div>
+                <div class='testcase'>TestEbookConvert - test_kindle_send_not_configured</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -490,7 +494,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_ssl_smtp_setup_error</div>
+                <div class='testcase'>TestEbookConvert - test_ssl_smtp_setup_error</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -499,7 +503,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt5.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_starttls_smtp_setup_error</div>
+                <div class='testcase'>TestEbookConvert - test_starttls_smtp_setup_error</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -507,8 +511,8 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_edit_additional_books.TestEditAdditionalBooks</td>
+    <tr id="su" class="passClass">
+        <td>TestEditAdditionalBooks</td>
         <td class="text-center">5</td>
         <td class="text-center">5</td>
         <td class="text-center">0</td>
@@ -523,7 +527,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_delete_book</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -532,7 +536,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_metadata_cbt</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -541,7 +545,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_metadate_cbr</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadate_cbr</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -550,7 +554,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_writeonly_database</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_database</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -559,7 +563,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_writeonly_path</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -567,11 +571,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_edit_books.TestEditBooks</td>
+    <tr id="su" class="failClass">
+        <td>TestEditBooks</td>
         <td class="text-center">33</td>
-        <td class="text-center">29</td>
-        <td class="text-center">2</td>
+        <td class="text-center">30</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
@@ -583,7 +587,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_download_book</div>
+                <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -592,7 +596,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_author</div>
+                <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -601,7 +605,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_category</div>
+                <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -610,7 +614,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_comments</div>
+                <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -619,7 +623,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_custom_bool</div>
+                <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -628,7 +632,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_custom_categories</div>
+                <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -637,7 +641,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_custom_float</div>
+                <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -646,7 +650,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_custom_int</div>
+                <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -655,7 +659,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_custom_rating</div>
+                <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -664,7 +668,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_custom_single_select</div>
+                <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -673,7 +677,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_custom_text</div>
+                <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -682,7 +686,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_language</div>
+                <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -691,7 +695,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.13' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_publisher</div>
+                <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -700,7 +704,7 @@ AssertionError: False is not true</pre>
     
         <tr id='st7.14' class='none bg-warning'>
             <td>
-                <div class='testcase'>test_edit_publishing_date</div>
+                <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -726,7 +730,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.15' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_rating</div>
+                <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -735,7 +739,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.16' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_series</div>
+                <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -744,7 +748,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.17' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_edit_title</div>
+                <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -753,7 +757,7 @@ AssertionError: False is not true</pre>
     
         <tr id='st7.18' class='none bg-warning'>
             <td>
-                <div class='testcase'>test_rename_uppercase_lowercase</div>
+                <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -779,7 +783,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.19' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_typeahead_author</div>
+                <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -788,7 +792,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.20' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_typeahead_functions</div>
+                <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -797,7 +801,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.21' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_typeahead_language</div>
+                <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -806,7 +810,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.22' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_typeahead_publisher</div>
+                <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -815,7 +819,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.23' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_typeahead_series</div>
+                <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -824,7 +828,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.24' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_typeahead_tag</div>
+                <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -833,7 +837,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.25' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_cbr</div>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -842,7 +846,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.26' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_cbt</div>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -851,7 +855,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.27' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_cbz</div>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -860,7 +864,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.28' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_epub</div>
+                <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -869,7 +873,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.29' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_fb2</div>
+                <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -878,7 +882,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.30' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_lit</div>
+                <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -887,47 +891,25 @@ AssertionError: False is not true</pre>
     
         <tr id='pt7.31' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_mobi</div>
+                <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='ft7.32' class='none bg-danger'>
+        <tr id='pt7.32' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_upload_book_pdf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.32')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft7.32' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft7.32').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_books.py", line 751, in test_upload_book_pdf
-    self.assertEqual('23390', resp.headers['Content-Length'])
-AssertionError: '23390' != '23427'
-- 23390
-+ 23427</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id='ft7.33' class='none bg-danger'>
             <td>
-                <div class='testcase'>test_upload_cover_hdd</div>
+                <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -942,7 +924,7 @@ AssertionError: '23390' != '23427'
                     </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_books.py", line 732, in test_upload_cover_hdd
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_books.py", line 735, in test_upload_cover_hdd
     self.assertTrue(False, "Browser-Cache Problem: Old Cover is displayed instead of New Cover")
 AssertionError: False is not true : Browser-Cache Problem: Old Cover is displayed instead of New Cover</pre>
                     </div>
@@ -955,12 +937,12 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_edit_books_gdrive.test_edit_books_gdrive</td>
+    <tr id="su" class="passClass">
+        <td>TestEditBooksGdrive</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">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c8', 1)">Detail</a>
@@ -969,46 +951,18 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
 
     
     
-        <tr id='et8.1' class='none bg-info'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_config_gdrive</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et8.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_et8.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_et8.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_edit_books_gdrive.py", line 139, in test_config_gdrive
-    auth_button.click()
-  File "/home/matthias/Entwicklung/calibre-web-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/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/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/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.WebDriverException: Message: Reached error page: about:neterror?e=connectionFailure&u=http%3A//127.0.0.1%3A8083/gdrive/authenticate&c=UTF-8&d=Firefox%20kann%20keine%20Verbindung%20zu%20dem%20Server%20unter%20127.0.0.1%3A8083%20aufbauen.</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestEditBooksGdrive - test_config_gdrive</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_email_STARTTLS.test_STARTTLS</td>
+    <tr id="su" class="passClass">
+        <td>TestSTARTTLS</td>
         <td class="text-center">3</td>
         <td class="text-center">3</td>
         <td class="text-center">0</td>
@@ -1023,7 +977,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_STARTTLS</div>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1032,7 +986,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_STARTTLS_SSL_setup_error</div>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1041,7 +995,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_STARTTLS_resend_password</div>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1049,8 +1003,8 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_email_ssl.test_SSL</td>
+    <tr id="su" class="passClass">
+        <td>TestSSL</td>
         <td class="text-center">4</td>
         <td class="text-center">4</td>
         <td class="text-center">0</td>
@@ -1065,7 +1019,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_SSL_None_setup_error</div>
+                <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1074,7 +1028,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_SSL_STARTTLS_setup_error</div>
+                <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1083,7 +1037,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_SSL_logging_email</div>
+                <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1092,7 +1046,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_SSL_only</div>
+                <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1100,8 +1054,8 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_goodreads.TestGoodreads</td>
+    <tr id="su" class="passClass">
+        <td>TestGoodreads</td>
         <td class="text-center">3</td>
         <td class="text-center">3</td>
         <td class="text-center">0</td>
@@ -1116,7 +1070,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_page</div>
+                <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1125,7 +1079,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_page_invalid</div>
+                <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1134,7 +1088,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_goodreads_about</div>
+                <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1142,8 +1096,8 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_helper.CalibreHelper</td>
+    <tr id="su" class="passClass">
+        <td>TestCalibreHelper</td>
         <td class="text-center">16</td>
         <td class="text-center">16</td>
         <td class="text-center">0</td>
@@ -1158,7 +1112,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_sort</div>
+                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1167,7 +1121,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_sort_comma</div>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1176,7 +1130,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_sort_junior</div>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1185,7 +1139,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_sort_oneword</div>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1194,7 +1148,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_sort_roman</div>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1203,7 +1157,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_Limit_Length</div>
+                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1212,7 +1166,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_char_replacement</div>
+                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1221,7 +1175,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_chinese_Characters</div>
+                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1230,7 +1184,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_deg_eur_replacement</div>
+                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1239,7 +1193,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_doubleS</div>
+                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1248,7 +1202,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_finish_Dot</div>
+                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1257,7 +1211,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_high23</div>
+                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1266,7 +1220,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_umlauts</div>
+                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1275,7 +1229,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_random_password</div>
+                <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1284,7 +1238,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_split_authors</div>
+                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1293,7 +1247,7 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
         <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_whitespaces</div>
+                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1301,75 +1255,95 @@ selenium.common.exceptions.WebDriverException: Message: Reached error page: abou
     
 
 
-    <tr class="result['header']['style']">
-        <td>unittest.loader._FailedTest</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="passClass">
+        <td>TestKoboSync</td>
+        <td class="text-center">8</td>
+        <td class="text-center">8</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 1)">Detail</a>
+            <a onclick="showClassDetail('c13', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='et13.1' class='none bg-info'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>unittestloader_FailedTest)</div>
+                <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_et13.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_et13.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">ImportError: Failed to import test module: test_kobo_sync
-Traceback (most recent call last):
-  File "/usr/lib/python3.8/unittest/loader.py", line 436, in _find_test_path
-    module = self._get_module_from_name(name)
-  File "/usr/lib/python3.8/unittest/loader.py", line 377, in _get_module_from_name
-    __import__(name)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_kobo_sync.py", line 228
-    session.close()'''
-
-
-    def test_sync_unchanged(self):
-        self.inital_sync()
-
-        # append synctoken to headers and start over again
-        newSession = requests.session()
-        r = newSession.get(self.kobo_adress+'/v1/initialization', headers=TestKoboSync.header)
-        self.assertEqual(r.status_code, 200)
-        params = {'Filter': 'All', 'DownloadUrlFilter': 'Generic,Android', 'PrioritizeRecentReads':'true'}
-        r = newSession.get(self.kobo_adress+'/v1/library/sync', params=params, headers=TestKoboSync.syncToken)
-        self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.json(), [])
-        newSession.close()
-        TestKoboSync.syncToken = {'x-kobo-synctoken': r.headers['x-kobo-synctoken']}
-
-    '''def test_sync_upload(self):
-                   ^
-SyntaxError: invalid syntax</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_invalid</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_upload</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_ldap.test_ldap_login</td>
+    <tr id="su" class="passClass">
+        <td>TestLdapLogin</td>
         <td class="text-center">10</td>
         <td class="text-center">10</td>
         <td class="text-center">0</td>
@@ -1384,7 +1358,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_LDAP_SSL</div>
+                <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1393,7 +1367,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_LDAP_STARTTLS</div>
+                <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1402,7 +1376,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_LDAP_fallback_Login</div>
+                <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1411,7 +1385,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_LDAP_import</div>
+                <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1420,7 +1394,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_LDAP_login</div>
+                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1429,7 +1403,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_invalid_LDAP</div>
+                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1438,7 +1412,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_ldap_about</div>
+                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1447,7 +1421,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_ldap_authentication</div>
+                <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1456,7 +1430,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_ldap_kobo_sync</div>
+                <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1465,7 +1439,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_ldap_opds_download_book</div>
+                <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1473,8 +1447,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_logging.test_logging</td>
+    <tr id="su" class="skipClass">
+        <td>TestLogging</td>
         <td class="text-center">7</td>
         <td class="text-center">6</td>
         <td class="text-center">0</td>
@@ -1489,7 +1463,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_access_log_recover</div>
+                <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1498,7 +1472,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_debug_log</div>
+                <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1507,7 +1481,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_failed_login</div>
+                <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1516,7 +1490,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='st15.4' class='none bg-warning'>
             <td>
-                <div class='testcase'>test_failed_register</div>
+                <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -1542,7 +1516,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_logfile_change</div>
+                <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1551,7 +1525,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_logfile_recover</div>
+                <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1560,7 +1534,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_logviewer</div>
+                <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1568,8 +1542,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_login.test_Login</td>
+    <tr id="su" class="passClass">
+        <td>TestLogin</td>
         <td class="text-center">11</td>
         <td class="text-center">11</td>
         <td class="text-center">0</td>
@@ -1584,7 +1558,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_digest_login</div>
+                <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1593,7 +1567,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_capital_letters_user_unicode_password</div>
+                <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1602,7 +1576,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_delete_admin</div>
+                <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1611,7 +1585,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_empty_password</div>
+                <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1620,7 +1594,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_locale_select</div>
+                <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1629,7 +1603,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_protected</div>
+                <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1638,7 +1612,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_remember_me</div>
+                <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1647,7 +1621,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_rename_user</div>
+                <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1656,7 +1630,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_unicode_user_space_end_password</div>
+                <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1665,7 +1639,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_login_user_with_space_password_end_space</div>
+                <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1674,7 +1648,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_robots</div>
+                <div class='testcase'>TestLogin - test_robots</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1682,8 +1656,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_oauth.test_OAuth_login</td>
+    <tr id="su" class="passClass">
+        <td>TestOAuthLogin</td>
         <td class="text-center">2</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
@@ -1698,7 +1672,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_oauth_about</div>
+                <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1707,7 +1681,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_visible_oauth</div>
+                <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1715,8 +1689,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_opds_feed.test_opds_feed</td>
+    <tr id="su" class="passClass">
+        <td>TestOPDSFeed</td>
         <td class="text-center">20</td>
         <td class="text-center">20</td>
         <td class="text-center">0</td>
@@ -1731,7 +1705,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds</div>
+                <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1740,7 +1714,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_author</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1749,7 +1723,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_calibre_companion</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1758,7 +1732,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_cover</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1767,7 +1741,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_download_book</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1776,7 +1750,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_formats</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1785,7 +1759,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_guest_user</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1794,7 +1768,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_hot</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1803,7 +1777,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_language</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1812,7 +1786,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_non_admin</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1821,7 +1795,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_publisher</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1830,7 +1804,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_random</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1839,7 +1813,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.13' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_ratings</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1848,7 +1822,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.14' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_read_unread</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1857,7 +1831,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.15' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_search</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1866,7 +1840,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.16' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_series</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1875,7 +1849,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.17' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_shelf_access</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1884,7 +1858,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.18' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_tags</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1893,7 +1867,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.19' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_opds_top_rated</div>
+                <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1902,7 +1876,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt18.20' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_recently_added</div>
+                <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1910,8 +1884,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_register.test_register</td>
+    <tr id="su" class="passClass">
+        <td>TestRegister</td>
         <td class="text-center">7</td>
         <td class="text-center">7</td>
         <td class="text-center">0</td>
@@ -1926,7 +1900,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_forgot_password</div>
+                <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1935,7 +1909,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_limit_domain</div>
+                <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1944,7 +1918,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_register_no_server</div>
+                <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1953,7 +1927,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_registering_only_email</div>
+                <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1962,7 +1936,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_registering_user</div>
+                <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1971,7 +1945,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_registering_user_fail</div>
+                <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1980,7 +1954,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_user_change_password</div>
+                <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1988,8 +1962,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_shelf.test_shelf</td>
+    <tr id="su" class="skipClass">
+        <td>TestShelf</td>
         <td class="text-center">10</td>
         <td class="text-center">9</td>
         <td class="text-center">0</td>
@@ -2004,7 +1978,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_add_shelf_from_search</div>
+                <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2013,7 +1987,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_arrange_shelf</div>
+                <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2022,7 +1996,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_delete_book_of_shelf</div>
+                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2031,7 +2005,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_private_shelf</div>
+                <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2040,7 +2014,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_public_private_shelf</div>
+                <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2049,7 +2023,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_public_shelf</div>
+                <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2058,7 +2032,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_rename_shelf</div>
+                <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2067,7 +2041,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_shelf_action_non_shelf_edit_role</div>
+                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2076,7 +2050,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='st20.9' class='none bg-warning'>
             <td>
-                <div class='testcase'>test_shelf_database_change</div>
+                <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -2102,7 +2076,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt20.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_shelf_long_name</div>
+                <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2110,8 +2084,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_updater.TestUpdater</td>
+    <tr id="su" class="skipClass">
+        <td>TestUpdater</td>
         <td class="text-center">8</td>
         <td class="text-center">7</td>
         <td class="text-center">0</td>
@@ -2126,7 +2100,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_update_nightly_errors</div>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2135,7 +2109,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_update_nightly_request_errors</div>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2144,7 +2118,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_update_stable_errors</div>
+                <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2153,7 +2127,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_update_stable_versions</div>
+                <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2162,7 +2136,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt21.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_perform_update</div>
+                <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2171,7 +2145,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt21.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_perform_update_stable_errors</div>
+                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2180,7 +2154,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='st21.7' class='none bg-warning'>
             <td>
-                <div class='testcase'>test_perform_update_timeout</div>
+                <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -2206,7 +2180,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt21.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_reconnect_database</div>
+                <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2214,8 +2188,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_user_template.test_user_template</td>
+    <tr id="su" class="passClass">
+        <td>TestUserTemplate</td>
         <td class="text-center">19</td>
         <td class="text-center">19</td>
         <td class="text-center">0</td>
@@ -2230,7 +2204,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_allow_column_restriction</div>
+                <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2239,7 +2213,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_allow_tag_restriction</div>
+                <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2248,7 +2222,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_archived_format_template</div>
+                <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2257,7 +2231,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_author_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2266,7 +2240,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_best_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2275,7 +2249,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_category_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2284,7 +2258,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_deny_column_restriction</div>
+                <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2293,7 +2267,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_deny_tag_restriction</div>
+                <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2302,7 +2276,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_detail_random_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2311,7 +2285,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_format_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2320,7 +2294,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_hot_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2329,7 +2303,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_language_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2338,7 +2312,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.13' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_limit_book_languages</div>
+                <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2347,7 +2321,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.14' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_publisher_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2356,7 +2330,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.15' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_random_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2365,7 +2339,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.16' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_read_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2374,7 +2348,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.17' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_recent_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2383,7 +2357,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.18' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_series_user_template</div>
+                <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2392,7 +2366,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt22.19' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_ui_language_settings</div>
+                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2400,8 +2374,8 @@ SyntaxError: invalid syntax</pre>
     
 
 
-    <tr class="result['header']['style']">
-        <td>test_visiblilitys.TestCalibreWebVisibilitys</td>
+    <tr id="su" class="passClass">
+        <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">30</td>
         <td class="text-center">30</td>
         <td class="text-center">0</td>
@@ -2416,7 +2390,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_about</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2425,7 +2399,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_SMTP_Settings</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2434,7 +2408,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_add_user</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2443,7 +2417,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_password</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2452,7 +2426,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_archived</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2461,7 +2435,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_authors</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2470,7 +2444,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_category</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2479,7 +2453,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_file_formats</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2488,7 +2462,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_hot</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2497,7 +2471,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_language</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2506,7 +2480,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_publisher</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2515,7 +2489,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_random</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2524,7 +2498,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.13' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_rated</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2533,7 +2507,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.14' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_rating</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2542,7 +2516,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.15' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_read</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2551,7 +2525,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.16' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_admin_change_visibility_series</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2560,7 +2534,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.17' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_allow_columns</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2569,7 +2543,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.18' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_allow_tags</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2578,7 +2552,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.19' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_archive_books</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2587,7 +2561,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.20' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_authors_max_settings</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2596,7 +2570,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.21' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_checked_logged_in</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2605,7 +2579,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.22' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_hide_custom_column</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2614,7 +2588,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.23' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_link_column_to_read_status</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2623,7 +2597,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.24' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_random_books_available</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2632,7 +2606,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.25' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_restrict_columns</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2641,7 +2615,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.26' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_restrict_tags</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2650,7 +2624,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.27' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_search_functions</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2659,7 +2633,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.28' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_search_string</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2668,7 +2642,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.29' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_user_email_available</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2677,7 +2651,7 @@ SyntaxError: invalid syntax</pre>
     
         <tr id='pt23.30' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_user_visibility_sidebar</div>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2686,10 +2660,10 @@ SyntaxError: invalid syntax</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>223</td>
-        <td>212</td>
-        <td>3</td>
+        <td>230</td>
+        <td>222</td>
         <td>2</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -2839,7 +2813,7 @@ SyntaxError: invalid syntax</pre>
             <tr>
               <th>Pillow</th>
               <td>7.2.0</td>
-              <td>testCoverEditBooks</td>
+              <td>TestCoverEditBooks</td>
             </tr>
           
             <tr>
@@ -2880,32 +2854,32 @@ SyntaxError: invalid syntax</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>1.10.0</td>
-              <td>test_edit_books_gdrive</td>
+              <td>1.11.0</td>
+              <td>TestEditBooksGdrive</td>
             </tr>
           
             <tr>
               <th>httplib2</th>
               <td>0.18.1</td>
-              <td>test_edit_books_gdrive</td>
+              <td>TestEditBooksGdrive</td>
             </tr>
           
             <tr>
               <th>oauth2client</th>
               <td>4.1.3</td>
-              <td>test_edit_books_gdrive</td>
+              <td>TestEditBooksGdrive</td>
             </tr>
           
             <tr>
               <th>PyDrive</th>
               <td>1.3.1</td>
-              <td>test_edit_books_gdrive</td>
+              <td>TestEditBooksGdrive</td>
             </tr>
           
             <tr>
               <th>PyYAML</th>
               <td>5.3.1</td>
-              <td>test_edit_books_gdrive</td>
+              <td>TestEditBooksGdrive</td>
             </tr>
           
             <tr>
@@ -2914,34 +2888,40 @@ SyntaxError: invalid syntax</pre>
               <td>TestGoodreads</td>
             </tr>
           
+            <tr>
+              <th>jsonschema</th>
+              <td>3.2.0</td>
+              <td>TestKoboSync</td>
+            </tr>
+          
             <tr>
               <th>Flask-SimpleLDAP</th>
               <td>1.4.0</td>
-              <td>test_ldap_login</td>
+              <td>TestLdapLogin</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
               <td>3.2.0</td>
-              <td>test_ldap_login</td>
+              <td>TestLdapLogin</td>
             </tr>
           
             <tr>
               <th>python-ldap</th>
               <td>3.3.1</td>
-              <td>test_ldap_login</td>
+              <td>TestLdapLogin</td>
             </tr>
           
             <tr>
               <th>Flask-Dance</th>
               <td>3.0.0</td>
-              <td>test_OAuth_login</td>
+              <td>TestOAuthLogin</td>
             </tr>
           
             <tr>
               <th>SQLAlchemy-Utils</th>
               <td>0.36.8</td>
-              <td>test_OAuth_login</td>
+              <td>TestOAuthLogin</td>
             </tr>
           
           </tbody>
@@ -2952,7 +2932,7 @@ SyntaxError: invalid syntax</pre>
 </div>
 
 <script>
-    drawCircle(212, 3, 2, 6);
+    drawCircle(222, 2, 0, 6);
 </script>
 
 </div>
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
new file mode 100644
index 00000000..702a2668
--- /dev/null
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -0,0 +1,3781 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Calibre-Web Tests</title>
+    <meta name="generator" content=""/>
+    <meta name="version" content=""/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- Bootstrap -->
+    <link href="./../cps/static/css/libs/bootstrap.min.css" rel="stylesheet">
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="./../cps/static/js/libs/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="./../cps/static/js/libs/bootstrap.min.js"></script>
+    <!-- Project CSS -->
+    <link href="css/runner.css" rel="stylesheet">
+    <!-- Project JS -->
+    <script src="js/runner.js"></script>
+</head>
+
+<body>
+
+
+    <div class="row report-title">
+        <h1 id='report_title' class="text-center">Calibre-Web Tests</h1>
+    </div>
+  <div class="row">
+    <div class="col">
+      <div class="col-xs-12 col-sm-6">
+        <div class="piechart">
+          <div>
+              <canvas id="circle" width="350" height="168" ></canvas>
+          </div>
+        </div>
+      </div>
+      <div class="col-xs-12 col-sm-6">
+      <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>2021-02-08 20:40:55</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>2021-02-08 23:09:33</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>2h 0 min</p>
+        </div>
+      </div>
+      </div>
+    </div>
+  </div>
+
+    <div class='report-description'>
+        <div id='report_description' class='row text-center'></div>
+    </div>
+<div class='text-center buttons'>
+<div id='show_detail_line' class="btn-group pagination-centered" role="group" aria-label="TESTE">
+    <button type="button" class="btn btn-success" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show only the execution summary" onclick="showCase(0)">Summary
+    </button>
+    <button type="button" class="btn btn-info" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show only the execution summary" onclick="showCase(5)">Summary Problems
+    </button>
+    <button type="button" class="btn btn-warning" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show skipped test cases" onclick="showCase(3)">Skipped
+    </button>
+    <button type="button" class="btn btn-danger" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show the filed test cases" onclick="showCase(1)">Failed
+    </button>
+        <button type="button" class="btn btn-info" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show the filed test cases" onclick="showCase(4)">Error
+    </button>
+    <button type="button" class="btn btn-primary" data-toggle="tooltip" aria-pressed="false" data-placement="top"
+            title="Show all test cases" onclick="showCase(2)">All
+    </button>
+</div>
+</div>
+<table id='result_table' class='table table-bordered table-responsive table-curved'>
+    <colgroup>
+        <col/>
+        <col/>
+        <col/>
+        <col/>
+        <col/>
+        <col/>
+    </colgroup>
+    <tr id='header_row' class="text-center bg-grey">
+        <td>Test Group/Test case</td>
+        <td>Count</td>
+        <td>Pass</td>
+        <td>Fail</td>
+        <td>Error</td>
+        <td>Skip</td>
+        <td>View</td>
+    </tr>
+
+
+    <tr id="su" class="passClass">
+        <td>TestAnonymous</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('c1', 13)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt1.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_check_locale_guest</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_format</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_hot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rated</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestCli</td>
+        <td class="text-center">8</td>
+        <td class="text-center">7</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', 8)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt2.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_already_started</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_bind_to_single_interface</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_cli_SSL_files</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_cli_different_folder</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_cli_different_settings_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st2.6" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestCli - test_cli_gdrive_location</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st2.6')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st2.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_st2.6').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_environ_port_setting</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </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="passClass">
+        <td>TestCoverEditBooks</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('c3', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt3.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestDeleteDatabase</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('c4', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt4.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEbookConvertCalibre</td>
+        <td class="text-center">11</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c5', 11)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt5.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEbookConvertCalibreGDrive</td>
+        <td class="text-center">6</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c6', 6)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt6.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt6.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt6.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</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>
+            <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="passClass">
+        <td>TestEbookConvertKepubify</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c7', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt7.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEbookConvertGDriveKepubify</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c8', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt8.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestEditAdditionalBooks</td>
+        <td class="text-center">13</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">
+            <a onclick="showClassDetail('c9', 13)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt9.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st9.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>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st9.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
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestEditBooks</td>
+        <td class="text-center">33</td>
+        <td class="text-center">31</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c10', 33)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt10.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_comments</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st10.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>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st10.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
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st10.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>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st10.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
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.22' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.23' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.24' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.25' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.27' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.28' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.29' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.32' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.33' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditBooksList</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c11', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt11.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_edit_books_list</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_list_visibility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_merge_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">20</td>
+        <td class="text-center">20</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('c12', 20)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </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">
+        <td>TestSTARTTLS</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c13', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt13.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestSSL</td>
+        <td class="text-center">5</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c14', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_logging_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_email_limit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestFilePicker</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c15', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt15.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_all_file</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt15.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt15.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestSetupGdrive</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt16.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestGoodreads</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c17', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt17.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_author_page</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_goodreads_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestKoboSync</td>
+        <td class="text-center">9</td>
+        <td class="text-center">8</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c18', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et18.1" class="none bg-info">
+            <td>
+                <div class='testcase'>TestKoboSync - test_book_download</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et18.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et18.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_et18.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/ozzie/Development/calibre-web-test/test/test_kobo_sync.py", line 593, in test_book_download
+    print(data[0]['NewEntitlement']['BookMetadata']['DownloadUrls'][1]['Url'])
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_kobo_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_invalid</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_upload</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestLdapLogin</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('c19', 13)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt19.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.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='pt19.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.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='pt19.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestLogging</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('c20', 7)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt20.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_access_log_recover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_debug_log</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_failed_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st20.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_st20.4')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st20.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_st20.4').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_logfile_change</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_logfile_recover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_logviewer</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestLogin</td>
+        <td class="text-center">14</td>
+        <td class="text-center">14</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('c21', 14)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt21.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_digest_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_delete_admin</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_empty_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_locale_select</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_protected</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_remember_me</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_rename_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.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='pt21.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_next</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_proxy_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_robots</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestOAuthLogin</td>
+        <td class="text-center">2</td>
+        <td class="text-center">2</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', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt22.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt22.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestOPDSFeed</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('c23', 21)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt23.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_random</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_search</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.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='pt23.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_recently_added</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReader</td>
+        <td class="text-center">5</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c24', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt24.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_comic_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_epub_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_pdf_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_sound_listener</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_txt_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestRegister</td>
+        <td class="text-center">8</td>
+        <td class="text-center">8</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c25', 8)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt25.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_forgot_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_illegal_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_limit_domain</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_register_no_server</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_registering_only_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_registering_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_registering_user_fail</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt25.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_user_change_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestShelf</td>
+        <td class="text-center">11</td>
+        <td class="text-center">10</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt26.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_arrange_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_private_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_public_private_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_public_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_rename_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_anonymous</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st26.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_st26.10')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st26.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_st26.10').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Change Database Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_long_name</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestUpdater</td>
+        <td class="text-center">8</td>
+        <td class="text-center">7</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('c27', 8)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt27.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.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='pt27.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='pt27.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='pt27.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='pt27.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st27.7" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.7')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st27.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_st27.7').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Takes too long</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_reconnect_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</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('c28', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt28.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>
+        <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('c29', 21)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt29.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_author_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_best_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_category_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_download_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_format_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_language_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_list_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_random_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_read_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_series_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestCalibreWebVisibilitys</td>
+        <td class="text-center">33</td>
+        <td class="text-center">33</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('c30', 33)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt30.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.22' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.23' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.24' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.25' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.27' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.28' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.29' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.32' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt30.33' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestCalibreHelper</td>
+        <td class="text-center">16</td>
+        <td class="text-center">16</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c31', 16)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt31.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_random_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt31.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+    <tr id='total_row' class="text-center bg-grey">
+        <td>Total</td>
+        <td>299</td>
+        <td>291</td>
+        <td>0</td>
+        <td>1</td>
+        <td>7</td>
+        <td>&nbsp;</td>
+    </tr>
+</table>
+<div class="panel-group">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <a class="accordion-toggle" data-toggle="collapse" href="#collapseOne">
+          <span class="glyphicon glyphicon-plus"></span>
+          Tested environment
+        </a>
+      </h4>
+    </div>
+    <div id="collapseOne" class="panel-collapse collapse">
+      <div class="panel-body">
+        <table id="libs" class="table">
+          <thead>
+            <tr>
+              <th>Program library</th>
+              <th>Installed Version</th>
+              <th>Test class</th>
+            </tr>
+          </thead>
+          <tbody>
+          
+            <tr>
+              <th>Platform</th>
+              <td>Linux 5.8.0-41-generic #46~20.04.1-Ubuntu SMP Mon Jan 18 17:52:23 UTC 2021 x86_64 x86_64</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Python</th>
+              <td>3.8.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Babel</th>
+              <td>2.8.1</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>backports-abc</th>
+              <td>0.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask</th>
+              <td>1.1.2</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Babel</th>
+              <td>2.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Login</th>
+              <td>0.5.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Principal</th>
+              <td>0.4.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>iso-639</th>
+              <td>0.4.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Jinja2</th>
+              <td>2.11.3</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>PyPDF2</th>
+              <td>1.26.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>pytz</th>
+              <td>2021.1</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>requests</th>
+              <td>2.24.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>singledispatch</th>
+              <td>3.4.0.3</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>six</th>
+              <td>1.15.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>SQLAlchemy</th>
+              <td>1.3.23</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>tornado</th>
+              <td>6.1</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Unidecode</th>
+              <td>1.1.2</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Wand</th>
+              <td>0.6.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Werkzeug</th>
+              <td>1.0.1</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.8</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.19.0</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.7.2</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.4.1</td>
+              <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.19.0</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.2</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.4.1</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
+            <tr>
+              <th>comicapi</th>
+              <td>2.1.3</td>
+              <td>TestEditAdditionalBooks</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEditAdditionalBooks</td>
+            </tr>
+          
+            <tr>
+              <th>rarfile</th>
+              <td>4.0</td>
+              <td>TestEditAdditionalBooks</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEditBooks</td>
+            </tr>
+          
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.8</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.19.0</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.7.2</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.4.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.8</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.19.0</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.7.2</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.4.1</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>goodreads</th>
+              <td>0.3.2</td>
+              <td>TestGoodreads</td>
+            </tr>
+          
+            <tr>
+              <th>python-Levenshtein</th>
+              <td>0.12.2</td>
+              <td>TestGoodreads</td>
+            </tr>
+          
+            <tr>
+              <th>jsonschema</th>
+              <td>3.2.0</td>
+              <td>TestKoboSync</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-SimpleLDAP</th>
+              <td>1.4.0</td>
+              <td>TestLdapLogin</td>
+            </tr>
+          
+            <tr>
+              <th>jsonschema</th>
+              <td>3.2.0</td>
+              <td>TestLdapLogin</td>
+            </tr>
+          
+            <tr>
+              <th>python-ldap</th>
+              <td>3.3.1</td>
+              <td>TestLdapLogin</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Dance</th>
+              <td>3.2.0</td>
+              <td>TestOAuthLogin</td>
+            </tr>
+          
+            <tr>
+              <th>SQLAlchemy-Utils</th>
+              <td>0.36.8</td>
+              <td>TestOAuthLogin</td>
+            </tr>
+          
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+    drawCircle(291, 0, 1, 7);
+</script>
+
+</div>
+
+<footer>
+<div id='foter' class="text-center">
+    <p>Made with HTMLTestRunner from https://github.com/oldani/HtmlTestRunner</p>
+</div>
+</footer>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/test/Calibre-Web TestSummary_Windows.html b/test/Calibre-Web TestSummary_Windows.html
new file mode 100644
index 00000000..eadf672d
--- /dev/null
+++ b/test/Calibre-Web TestSummary_Windows.html	
@@ -0,0 +1,4211 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Calibre-Web Tests</title>
+    <meta name="generator" content=""/>
+    <meta name="version" content=""/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- Bootstrap -->
+    <link href="./../cps/static/css/libs/bootstrap.min.css" rel="stylesheet">
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="./../cps/static/js/libs/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="./../cps/static/js/libs/bootstrap.min.js"></script>
+    <!-- Project CSS -->
+    <link href="css/runner.css" rel="stylesheet">
+    <!-- Project JS -->
+    <script src="js/runner.js"></script>
+</head>
+
+<body>
+
+
+    <div class="row report-title">
+        <h1 id='report_title' class="text-center">Calibre-Web Tests</h1>
+    </div>
+  <div class="row">
+    <div class="col">
+      <div class="col-xs-12 col-sm-6">
+        <div class="piechart">
+          <div>
+              <canvas id="circle" width="350" height="168" ></canvas>
+          </div>
+        </div>
+      </div>
+      <div class="col-xs-12 col-sm-6">
+      <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>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>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>2h 58 min</p>
+        </div>
+      </div>
+      </div>
+    </div>
+  </div>
+
+    <div class='report-description'>
+        <div id='report_description' class='row text-center'></div>
+    </div>
+<div class='text-center buttons'>
+<div id='show_detail_line' class="btn-group pagination-centered" role="group" aria-label="TESTE">
+    <button type="button" class="btn btn-success" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show only the execution summary" onclick="showCase(0)">Summary
+    </button>
+    <button type="button" class="btn btn-info" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show only the execution summary" onclick="showCase(5)">Summary Problems
+    </button>
+    <button type="button" class="btn btn-warning" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show skipped test cases" onclick="showCase(3)">Skipped
+    </button>
+    <button type="button" class="btn btn-danger" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show the filed test cases" onclick="showCase(1)">Failed
+    </button>
+        <button type="button" class="btn btn-info" data-toggle="button" aria-pressed="false" data-placement="top"
+            title="Show the filed test cases" onclick="showCase(4)">Error
+    </button>
+    <button type="button" class="btn btn-primary" data-toggle="tooltip" aria-pressed="false" data-placement="top"
+            title="Show all test cases" onclick="showCase(2)">All
+    </button>
+</div>
+</div>
+<table id='result_table' class='table table-bordered table-responsive table-curved'>
+    <colgroup>
+        <col/>
+        <col/>
+        <col/>
+        <col/>
+        <col/>
+        <col/>
+    </colgroup>
+    <tr id='header_row' class="text-center bg-grey">
+        <td>Test Group/Test case</td>
+        <td>Count</td>
+        <td>Pass</td>
+        <td>Fail</td>
+        <td>Error</td>
+        <td>Skip</td>
+        <td>View</td>
+    </tr>
+
+
+    <tr id="su" class="passClass">
+        <td>TestAnonymous</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('c1', 13)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt1.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_check_locale_guest</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_format</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_hot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rated</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestCli</td>
+        <td class="text-center">8</td>
+        <td class="text-center">7</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', 8)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt2.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_already_started</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_bind_to_single_interface</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_cli_SSL_files</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_cli_different_folder</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_cli_different_settings_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st2.6" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestCli - test_cli_gdrive_location</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st2.6')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st2.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_st2.6').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_environ_port_setting</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </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="passClass">
+        <td>TestCoverEditBooks</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('c3', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt3.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestDeleteDatabase</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('c4', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt4.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEbookConvertCalibre</td>
+        <td class="text-center">11</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c5', 11)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt5.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt5.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <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', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et6.1" class="none bg-info">
+            <td>
+                <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>
+        </tr>
+    
+    
+    
+        <tr id="et6.2" class="none bg-info">
+            <td>
+                <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>
+        </tr>
+    
+    
+    
+        <tr id="et6.3" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_updater)</div>
+            </td>
+            <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>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEbookConvertKepubify</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c7', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt7.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestEditAdditionalBooks</td>
+        <td class="text-center">13</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c8', 13)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt8.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <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_st8.12')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st8.12" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_st8.12').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <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_st8.13')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st8.13" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_st8.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">writeonly database on windows is not checked</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestEditBooks</td>
+        <td class="text-center">33</td>
+        <td class="text-center">31</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c9', 33)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt9.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_comments</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <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_st9.14')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <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_st9.14').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_edit_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <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_st9.18')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <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_st9.18').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.22' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.23' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.24' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.25' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.27' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.28' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.29' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.32' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.33' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditBooksList</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c10', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt10.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_edit_books_list</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_list_visibility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_merge_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="failClass">
+        <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">20</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('c11', 20)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt11.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <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_ft11.19')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <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_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 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>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.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">
+        <td>TestSTARTTLS</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c12', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestSSL</td>
+        <td class="text-center">5</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c13', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt13.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_logging_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_SSL_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt13.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSSL - test_email_limit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestSetupGdrive</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c14', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestGoodreads</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c15', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt15.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_author_page</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt15.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt15.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_goodreads_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestKoboSync</td>
+        <td class="text-center">9</td>
+        <td class="text-center">9</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('c16', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt16.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_book_download</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_kobo_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_invalid</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_upload</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestLdapLogin</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('c17', 13)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt17.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='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>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.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='pt17.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestLogging</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('c18', 7)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt18.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_access_log_recover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_debug_log</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_failed_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <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_st18.4')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <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_st18.4').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_logfile_change</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_logfile_recover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogging - test_logviewer</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestLogin</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('c19', 13)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt19.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_digest_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_delete_admin</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_empty_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_locale_select</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_protected</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_remember_me</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_rename_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <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>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_robots</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestOAuthLogin</td>
+        <td class="text-center">2</td>
+        <td class="text-center">2</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', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt20.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestOPDSFeed</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('c21', 21)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt21.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_random</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_search</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.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='pt21.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_recently_added</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReader</td>
+        <td class="text-center">5</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c22', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt22.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_comic_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt22.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_epub_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt22.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_pdf_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt22.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_sound_listener</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt22.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_txt_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestRegister</td>
+        <td class="text-center">7</td>
+        <td class="text-center">7</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', 7)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt23.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_forgot_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_limit_domain</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_register_no_server</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_registering_only_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_registering_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_registering_user_fail</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt23.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestRegister - test_user_change_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestShelf</td>
+        <td class="text-center">11</td>
+        <td class="text-center">10</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt24.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_arrange_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_private_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_public_private_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_public_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_rename_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_anonymous</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <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_st24.10')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <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_st24.10').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Change Database Not Implemented</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt24.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_long_name</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestUpdater</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</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('c25', 15)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et25.1" 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.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.1" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_et25.1').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "C:\Entwicklung\calibre-web-test\test\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>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <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_st25.13')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <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_st25.13').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Takes too long</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <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>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestUserTemplate</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('c27', 21)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt27.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_author_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_best_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_category_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_download_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_format_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_language_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_list_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_random_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_read_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_series_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestCalibreWebVisibilitys</td>
+        <td class="text-center">33</td>
+        <td class="text-center">33</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('c28', 33)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt28.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.22' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.23' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.24' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.25' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.27' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.28' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.29' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.32' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt28.33' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestCalibreHelper</td>
+        <td class="text-center">16</td>
+        <td class="text-center">16</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c29', 16)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt29.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_random_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+    <tr id='total_row' class="text-center bg-grey">
+        <td>Total</td>
+        <td>295</td>
+        <td>269</td>
+        <td>1</td>
+        <td>17</td>
+        <td>8</td>
+        <td>&nbsp;</td>
+    </tr>
+</table>
+<div class="panel-group">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <a class="accordion-toggle" data-toggle="collapse" href="#collapseOne">
+          <span class="glyphicon glyphicon-plus"></span>
+          Tested environment
+        </a>
+      </h4>
+    </div>
+    <div id="collapseOne" class="panel-collapse collapse">
+      <div class="panel-body">
+        <table id="libs" class="table">
+          <thead>
+            <tr>
+              <th>Program library</th>
+              <th>Installed Version</th>
+              <th>Test class</th>
+            </tr>
+          </thead>
+          <tbody>
+          
+            <tr>
+              <th>Platform</th>
+              <td>Windows 10 10.0.19041 Intel64 Family 6 Model 69 Stepping 1, GenuineIntel AMD64</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Python</th>
+              <td>3.8.6</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Babel</th>
+              <td>2.8.1</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>backports-abc</th>
+              <td>0.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask</th>
+              <td>1.1.2</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Babel</th>
+              <td>2.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Login</th>
+              <td>0.5.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Principal</th>
+              <td>0.4.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>iso-639</th>
+              <td>0.4.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Jinja2</th>
+              <td>2.11.2</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>PyPDF2</th>
+              <td>1.26.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>pytz</th>
+              <td>2020.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>requests</th>
+              <td>2.24.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>singledispatch</th>
+              <td>3.4.0.3</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>six</th>
+              <td>1.15.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>SQLAlchemy</th>
+              <td>1.3.22</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>tornado</th>
+              <td>6.1</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Unidecode</th>
+              <td>1.1.2</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Wand</th>
+              <td>0.6.5</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>Werkzeug</th>
+              <td>1.0.1</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.8</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.18.1</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
+              <td>TestEbookConvertCalibreGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.3.1</td>
+              <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>
+              <td>TestEditAdditionalBooks</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEditAdditionalBooks</td>
+            </tr>
+          
+            <tr>
+              <th>rarfile</th>
+              <td>4.0</td>
+              <td>TestEditAdditionalBooks</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEditBooks</td>
+            </tr>
+          
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.8</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.18.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.3.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.8</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.18.1</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.3.1</td>
+              <td>TestSetupGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>goodreads</th>
+              <td>0.3.2</td>
+              <td>TestGoodreads</td>
+            </tr>
+          
+            <tr>
+              <th>jsonschema</th>
+              <td>3.2.0</td>
+              <td>TestKoboSync</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-SimpleLDAP</th>
+              <td>1.4.0</td>
+              <td>TestLdapLogin</td>
+            </tr>
+          
+            <tr>
+              <th>jsonschema</th>
+              <td>3.2.0</td>
+              <td>TestLdapLogin</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Dance</th>
+              <td>3.2.0</td>
+              <td>TestOAuthLogin</td>
+            </tr>
+          
+            <tr>
+              <th>SQLAlchemy-Utils</th>
+              <td>0.36.8</td>
+              <td>TestOAuthLogin</td>
+            </tr>
+          
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+    drawCircle(269, 1, 17, 8);
+</script>
+
+</div>
+
+<footer>
+<div id='foter' class="text-center">
+    <p>Made with HTMLTestRunner from https://github.com/oldani/HtmlTestRunner</p>
+</div>
+</footer>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/test/js/runner.js b/test/js/runner.js
index c0750e21..67b3fa39 100644
--- a/test/js/runner.js
+++ b/test/js/runner.js
@@ -42,6 +42,15 @@ function showCase(level) {
                 row.classList.add('hiddenRow');
             }
         }
+        // Show error if all or error or summary problems  selected
+        if (id.substr(0,2) == 'su') {
+            if (level == 0 || level == 2) { 
+                row.classList.remove('hiddenRow');
+            }
+            else {
+                row.classList.add('hiddenRow');
+            }
+        }
 		
     }
 }
@@ -188,4 +197,4 @@ function show_img(obj) {
 function hide_img(obj){
     obj.parentElement.style.display = "none";
     obj.parentElement.getElementsByClassName('imgyuan')[0].innerHTML = "";
-}
\ No newline at end of file
+}